Patchwork [2,of,6] merge: duplicate 'if f in copied' into each branch

login
register
mail settings
Submitter Martin von Zweigbergk
Date Dec. 3, 2014, 5:17 p.m.
Message ID <17f0fda2398ba2463589.1417627032@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/6981/
State Superseded
Headers show

Comments

Martin von Zweigbergk - Dec. 3, 2014, 5:17 p.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1416784130 28800
#      Sun Nov 23 15:08:50 2014 -0800
# Node ID 17f0fda2398ba2463589a3a59efe78b095b5d593
# Parent  d7561452bb66ad2b926aa803ecc0c48ce2496573
merge: duplicate 'if f in copied' into each branch

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -441,10 +441,10 @@ 
                 else: # both changed something
                     actions['m'].append((f, (f, f, f, False, pa.node()),
                                    "versions differ"))
-        elif f in copied: # files we'll deal with on m2 side
-            pass
         elif n1: # file exists only on local side
-            if f in movewithdir: # directory rename, move local
+            if f in copied:
+                pass # we'll deal with it on m2 side
+            elif f in movewithdir: # directory rename, move local
                 f2 = movewithdir[f]
                 actions['dm'].append((f2, (f, fl1),
                                 "remote directory rename - move from " + f))
@@ -467,7 +467,9 @@ 
                 else:
                     actions['r'].append((f, None, "other deleted"))
         elif n2: # file exists only on remote side
-            if f in movewithdir:
+            if f in copied:
+                pass # we'll deal with it on m1 side
+            elif f in movewithdir:
                 f2 = movewithdir[f]
                 actions['dg'].append((f2, (f, fl2),
                                 "local directory rename - get from " + f))