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

     1

+ mkdir r1

     2

+ cd r1

     3

+ hg init

     4

+ echo a

     5

+ hg addremove

     6

+ hg commit -t 1 -u test -d '0 0'

     7

+ hg clone . ../r2

     8

+ cd ../r2

     9

+ hg up

    10

+ echo abc

    11

+ hg diff

    12

+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'

    13

diff -r c19d34741b0a a

    14

--- a/a

    15

+++ b/a

    16

@@ -1,1 +1,1 @@

    17

-a

    18

+abc

    19

+ cd ../r1

    20

+ echo b

    21

+ echo a2

    22

+ hg addremove

    23

+ hg commit -t 2 -u test -d '0 0'

    24

+ cd ../r2

    25

+ hg -q pull ../r1

    26

+ hg status

    27

C a

    28

+ hg --debug up

    29

resolving manifests

    30

 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e

    31

 a versions differ, resolve

    32

remote created b

    33

getting b

    34

merging a

    35

resolving a

    36

file a: other d730145abbf9 ancestor b789fdd96dc2

    37

+ hg --debug up -m

    38

resolving manifests

    39

 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e

    40

+ hg parents

    41

changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6

    42

tag:         tip

    43

user:        test

    44

date:        Thu Jan  1 00:00:00 1970

    45

summary:     2

    46

    47

+ hg -v history

    48

changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6

    49

tag:         tip

    50

manifest:    1:1165e8bd193e17ad7d321d846fcf27ff3f412758

    51

user:        test

    52

date:        Thu Jan  1 00:00:00 1970

    53

files:       a b

    54

description:

    55

2

    56

    57

    58

changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e

    59

manifest:    0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0

    60

user:        test

    61

date:        Thu Jan  1 00:00:00 1970

    62

files:       a

    63

description:

    64

1

    65

    66

    67

+ hg diff

    68

+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'

    69

diff -r 1e71731e6fbb a

    70

--- a/a

    71

+++ b/a

    72

@@ -1,1 +1,1 @@

    73

-a2

    74

+abc