changeset 7689 | d821ea464465 |
parent 7564 | f1af59451c0c |
child 7690 | 1574c2704b11 |
child 7802 | dd970a311ea8 |
--- a/mercurial/localrepo.py Wed Jan 21 11:15:47 2009 -0600 +++ b/mercurial/localrepo.py Sun Jan 25 18:55:29 2009 +0100 @@ -706,8 +706,8 @@ nfp = fp2 if manifest2: # branch merge - if fp2 == nullid: # copied on remote side - if fp1 != nullid or cf in manifest2: + if fp2 == nullid or cr is None: # copied on remote side + if cf in manifest2: cr = manifest2[cf] nfp = fp1