Mercurial > hg > truffle

changeset 15821:de8296c27680

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx archive: avoid multiple directory entries too
author Bernhard Urban <bernhard.urban@jku.at>
date Wed, 21 May 2014 15:34:35 +0200
parents f0127716b881
children 4900010a15d2
files mxtool/mx.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mxtool/mx.py	Wed May 21 15:29:38 2014 +0200
+++ b/mxtool/mx.py	Wed May 21 15:34:35 2014 +0200
@@ -100,7 +100,7 @@
                     zf._provenance = {}
                 existingSource = zf._provenance.get(arcname, None)
                 isOverwrite = False
-                if existingSource and existingSource != source and not arcname.endswith('/'):
+                if existingSource and existingSource != source:
                     log('warning: ' + self.path + ': overwriting ' + arcname + '\n  new: ' + source + '\n  old: ' + existingSource)
                     isOverwrite = True
                 zf._provenance[arcname] = source