Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 7689:d821ea464465

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a corner case when committing a rename after a merge (issue1476)
author Patrick Mezard <pmezard@gmail.com>
date Sun, 25 Jan 2009 18:55:29 +0100
parents f1af59451c0c
children 1574c2704b11 dd970a311ea8
comparison
equal deleted inserted replaced
7675:011e69b96c69 7689:d821ea464465
704 cf = cp[0] 704 cf = cp[0]
705 cr = manifest1.get(cf) 705 cr = manifest1.get(cf)
706 nfp = fp2 706 nfp = fp2
707 707
708 if manifest2: # branch merge 708 if manifest2: # branch merge
709 if fp2 == nullid: # copied on remote side 709 if fp2 == nullid or cr is None: # copied on remote side
710 if fp1 != nullid or cf in manifest2: 710 if cf in manifest2:
711 cr = manifest2[cf] 711 cr = manifest2[cf]
712 nfp = fp1 712 nfp = fp1
713 713
714 # find source in nearest ancestor if we've lost track 714 # find source in nearest ancestor if we've lost track
715 if not cr: 715 if not cr: