Mercurial > public > mercurial-scm > hg-stable

diff 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
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sun Jan 25 15:11:43 2009 +0800
+++ b/mercurial/localrepo.py	Sun Jan 25 18:58:12 2009 +0100
@@ -733,8 +733,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