Fix zombie files in merge # HG changeset patch # User maf46@burn.cl.cam.ac.uk # Node ID 57667c9b93a5a743e4629d15a0e6bd76699130c3 # Parent d2994b5298fb20f87dc1d4747635b280db3c0526 Fix zombie files in merge Keir Fraser observed the following: > I made a small test case that illustrates the bug in merging changesets > with 'hg remove's in them: > > 1. Create a repository A containing files foo & bar. > 2. Create clone called B. > 3. A removes file bar, and commits this removal. > 4. B edits file foo, and commits this edit. > > Now, if B: > # hg pull ../A; hg update -m; hg commit > Then bar remains deleted. > > If A: > # hg pull ../B; hg update -m; hg commit > Then bar is resurrected! > > It looks as though, when you merge across a branch, any deletions in > your own branch are forgotten. > ... > Fixing this is a must, as zombie files are a real pain. :-) Keir later patched our local copy of hg as shown below, which fixes the problem. I've also enclosed a test which captures the test Keir outlined... Files deleted on a branch should not automatically reappear in a merge Patch notes: 1. The first chunk does not change behaviour, but cleans up the code to more closely match check of 'force' in the second chunk. I think it makes the code clearer. 2. The second chunk fixes two bugs -- i. If we choose to keep a remotely-changed locally-deleted file, then we need to 'get' that file. If we choose to delete it then no action need be taken (it is already deleted in the working manifest). Without this fix, choosing to delete would get a Python traceback. ii. The test for whether the file was remotely-created is insufficient. It is only true if f is not in the common ancestor. Otherwise the file was deleted locally, and should remain deleted. (this is the most important fix!) Index: hg/tests/test-merge6 ===================================================================

--- a/mercurial/hg.py	Mon Jul 04 12:22:21 2005 -0800
+++ b/mercurial/hg.py	Mon Jul 04 12:38:34 2005 -0800
@@ -1179,9 +1179,9 @@
                             mark[f] = 1
                 del m2[f]
             elif f in ma:
-                if not force and n != ma[f]:
-                    r = ""
-                    if linear_path or allow:
+                if n != ma[f]:
+                    r = "d"
+                    if not force and (linear_path or allow):
                         r = self.ui.prompt(
                             (" local changed %s which remote deleted\n" % f) +
                             "(k)eep or (d)elete?", "[kd]", "k")
@@ -1203,16 +1203,18 @@
         for f, n in m2.iteritems():
             if choose and not choose(f): continue
             if f[0] == "/": continue
-            if not force and f in ma and n != ma[f]:
-                r = ""
-                if linear_path or allow:
+            if f in ma and n != ma[f]:
+                r = "k"
+                if not force and (linear_path or allow):
                     r = self.ui.prompt(
                         ("remote changed %s which local deleted\n" % f) +
                         "(k)eep or (d)elete?", "[kd]", "k")
-                if r == "d": remove.append(f)
-            else:
+                if r == "k": get[f] = n
+            elif f not in ma:
                 self.ui.debug("remote created %s\n" % f)
                 get[f] = n
+            else:
+                self.ui.debug("local deleted %s\n" % f)
 
         del mw, m1, m2, ma