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

+ cat

     2

+ chmod +x merge

     3

+ export HGMERGE=./merge

     4

+ HGMERGE=./merge

     5

+ mkdir A1

     6

+ cd A1

     7

+ hg init

     8

+ echo This is file foo1

     9

+ echo This is file bar1

    10

+ hg add foo bar

    11

+ hg commit -t 'commit text' -d '0 0' -u user

    12

+ cd ..

    13

+ hg clone A1 B1

    14

+ cd A1

    15

+ rm bar

    16

+ hg remove bar

    17

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

    18

+ cd ../B1

    19

+ echo This is file foo22

    20

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

    21

+ cd ..

    22

+ hg clone A1 A2

    23

+ hg clone B1 B2

    24

+ cd A1

    25

+ hg pull ../B1

    26

pulling from ../B1

    27

searching for changes

    28

adding changesets

    29

adding manifests

    30

adding file revisions

    31

modified 1 files, added 1 changesets and 1 new revisions

    32

(run 'hg update' to get a working copy)

    33

+ hg update -m

    34

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

    35

+ echo bar should remain deleted.

    36

bar should remain deleted.

    37

+ hg manifest

    38

6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo

    39

+ cd ../B2

    40

+ hg pull ../A2

    41

pulling from ../A2

    42

searching for changes

    43

adding changesets

    44

adding manifests

    45

adding file revisions

    46

modified 0 files, added 1 changesets and 0 new revisions

    47

(run 'hg update' to get a working copy)

    48

+ hg update -m

    49

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

    50

+ echo bar should remain deleted.

    51

bar should remain deleted.

    52

+ hg manifest

    53

6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo