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

+ mkdir t

     4

+ cd t

     5

+ hg init

     6

+ echo This is file a1

     7

+ hg add a

     8

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

     9

+ echo This is file b1

    10

+ hg add b

    11

+ hg commit -t 'commit #1' -d '0 0' -u user

    12

+ hg update 0

    13

+ echo This is file c1

    14

+ hg add c

    15

+ hg commit -t 'commit #2' -d '0 0' -u user

    16

+ echo This is file b1

    17

+ env HGMERGE=../merge hg update -m 1

    18

+ cd ..

    19

+ /bin/rm -rf t

    20

+ mkdir t

    21

+ cd t

    22

+ hg init

    23

+ echo This is file a1

    24

+ hg add a

    25

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

    26

+ echo This is file b1

    27

+ hg add b

    28

+ hg commit -t 'commit #1' -d '0 0' -u user

    29

+ hg update 0

    30

+ echo This is file c1

    31

+ hg add c

    32

+ hg commit -t 'commit #2' -d '0 0' -u user

    33

+ echo This is file b2

    34

+ env HGMERGE=../merge hg update -m 1

    35

merging for b

    36

merging b

    37

+ cd ..

    38

+ /bin/rm -rf t

    39

+ mkdir t

    40

+ cd t

    41

+ hg init

    42

+ echo This is file a1

    43

+ hg add a

    44

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

    45

+ echo This is file b1

    46

+ hg add b

    47

+ hg commit -t 'commit #1' -d '0 0' -u user

    48

+ echo This is file b22

    49

+ hg commit -t 'commit #2' -d '0 0' -u user

    50

+ hg update 1

    51

+ echo This is file c1

    52

+ hg add c

    53

+ hg commit -t 'commit #3' -d '0 0' -u user

    54

+ cat b

    55

This is file b1

    56

+ echo This is file b22

    57

+ env HGMERGE=../merge hg update -m 2

    58

merging for b

    59

merging b

    60

+ cd ..

    61

+ /bin/rm -rf t

    62

+ mkdir t

    63

+ cd t

    64

+ hg init

    65

+ echo This is file a1

    66

+ hg add a

    67

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

    68

+ echo This is file b1

    69

+ hg add b

    70

+ hg commit -t 'commit #1' -d '0 0' -u user

    71

+ echo This is file b22

    72

+ hg commit -t 'commit #2' -d '0 0' -u user

    73

+ hg update 1

    74

+ echo This is file c1

    75

+ hg add c

    76

+ hg commit -t 'commit #3' -d '0 0' -u user

    77

+ echo This is file b33

    78

+ env HGMERGE=../merge hg update -m 2

    79

merging for b

    80

merging b

    81

+ cd ..

    82

+ /bin/rm -rf t