--- 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