Mercurial > hg > truffle

changeset 16086:6eef506c173d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx archive: only print overwrite warning on files
author Bernhard Urban <bernhard.urban@jku.at>
date Thu, 12 Jun 2014 11:39:53 +0200
parents 0cdce0e2d122
children 64e172733061
files mxtool/mx.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mxtool/mx.py	Wed Jun 11 18:15:45 2014 +0200
+++ b/mxtool/mx.py	Thu Jun 12 11:39:53 2014 +0200
@@ -102,7 +102,8 @@
                 existingSource = zf._provenance.get(arcname, None)
                 isOverwrite = False
                 if existingSource and existingSource != source:
-                    log('warning: ' + self.path + ': avoid overwrite of ' + arcname + '\n  new: ' + source + '\n  old: ' + existingSource)
+                    if arcname[-1] != os.path.sep:
+                        log('warning: ' + self.path + ': avoid overwrite of ' + arcname + '\n  new: ' + source + '\n  old: ' + existingSource)
                     isOverwrite = True
                 zf._provenance[arcname] = source
                 return isOverwrite