Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/context.py @ 3351:50a18815e3f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert changeset c67920d78248. It breaks 'hg merge && hg up -c REV' when files exist only in one of the manifests, making hg throw a traceback like:
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Tue, 10 Oct 2006 21:03:24 +0300
parents 6c68bc1e7873
children 69fe021cc23e
comparison
equal deleted inserted replaced
3324:34f08b8883cf 3351:50a18815e3f0
358 for f in l: 358 for f in l:
359 man[f] = man.get(copied.get(f, f), nullid) + i 359 man[f] = man.get(copied.get(f, f), nullid) + i
360 man.set(f, util.is_exec(self._repo.wjoin(f), man.execf(f))) 360 man.set(f, util.is_exec(self._repo.wjoin(f), man.execf(f)))
361 361
362 for f in deleted + removed: 362 for f in deleted + removed:
363 del man[f] 363 if f in man:
364 del man[f]
364 365
365 self._manifest = man 366 self._manifest = man
366 367
367 def manifest(self): return self._manifest 368 def manifest(self): return self._manifest
368 369