Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 7690:1574c2704b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sun, 25 Jan 2009 18:58:12 +0100
parents e5f445c94226 d821ea464465
children 752325f2208d
comparison
equal deleted inserted replaced
7688:9e70287086c7 7690:1574c2704b11
731 cf = cp[0] 731 cf = cp[0]
732 cr = manifest1.get(cf) 732 cr = manifest1.get(cf)
733 nfp = fp2 733 nfp = fp2
734 734
735 if manifest2: # branch merge 735 if manifest2: # branch merge
736 if fp2 == nullid: # copied on remote side 736 if fp2 == nullid or cr is None: # copied on remote side
737 if fp1 != nullid or cf in manifest2: 737 if cf in manifest2:
738 cr = manifest2[cf] 738 cr = manifest2[cf]
739 nfp = fp1 739 nfp = fp1
740 740
741 # find source in nearest ancestor if we've lost track 741 # find source in nearest ancestor if we've lost track
742 if not cr: 742 if not cr: