Mercurial > hg > truffle

comparison mxtool/mx.py @ 15822:4900010a15d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx archive: fix log message
author Bernhard Urban <bernhard.urban@jku.at>
date Wed, 21 May 2014 16:41:57 +0200
parents de8296c27680
children 9acad98567dc
comparison
equal deleted inserted replaced
15821:de8296c27680 15822:4900010a15d2
99 if not hasattr(zf, '_provenance'): 99 if not hasattr(zf, '_provenance'):
100 zf._provenance = {} 100 zf._provenance = {}
101 existingSource = zf._provenance.get(arcname, None) 101 existingSource = zf._provenance.get(arcname, None)
102 isOverwrite = False 102 isOverwrite = False
103 if existingSource and existingSource != source: 103 if existingSource and existingSource != source:
104 log('warning: ' + self.path + ': overwriting ' + arcname + '\n new: ' + source + '\n old: ' + existingSource) 104 log('warning: ' + self.path + ': avoid overwrite of ' + arcname + '\n new: ' + source + '\n old: ' + existingSource)
105 isOverwrite = True 105 isOverwrite = True
106 zf._provenance[arcname] = source 106 zf._provenance[arcname] = source
107 return isOverwrite 107 return isOverwrite
108 108
109 if self.mainClass: 109 if self.mainClass: