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

#!/bin/sh -x

     2

     3

cat <<'EOF' > merge

     4

#!/bin/sh

     5

echo merging for `basename $1`

     6

EOF

     7

chmod +x merge

     8

     9

mkdir t

    10

cd t

    11

hg init

    12

echo This is file a1 > a

    13

hg add a

    14

hg commit -t "commit #0" -d "0 0" -u user

    15

echo This is file b1 > b

    16

hg add b

    17

hg commit -t "commit #1" -d "0 0" -u user

    18

    19

hg update 0

    20

echo This is file c1 > c

    21

hg add c

    22

hg commit -t "commit #2" -d "0 0" -u user

    23

echo This is file b1 > b

    24

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

    25

# no merges expected

    26

cd ..; /bin/rm -rf t

    27

    28

mkdir t

    29

cd t

    30

hg init

    31

echo This is file a1 > a

    32

hg add a

    33

hg commit -t "commit #0" -d "0 0" -u user

    34

echo This is file b1 > b

    35

hg add b

    36

hg commit -t "commit #1" -d "0 0" -u user

    37

    38

hg update 0

    39

echo This is file c1 > c

    40

hg add c

    41

hg commit -t "commit #2" -d "0 0" -u user

    42

echo This is file b2 > b

    43

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

    44

# merge of b expected

    45

cd ..; /bin/rm -rf t

    46

    47

mkdir t

    48

cd t

    49

hg init

    50

echo This is file a1 > a

    51

hg add a

    52

hg commit -t "commit #0" -d "0 0" -u user

    53

echo This is file b1 > b

    54

hg add b

    55

hg commit -t "commit #1" -d "0 0" -u user

    56

echo This is file b22 > b

    57

hg commit -t "commit #2" -d "0 0" -u user

    58

hg update 1

    59

echo This is file c1 > c

    60

hg add c

    61

hg commit -t "commit #3" -d "0 0" -u user

    62

cat b

    63

echo This is file b22 > b

    64

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

    65

# merge expected!

    66

cd ..; /bin/rm -rf t

    67

    68

mkdir t

    69

cd t

    70

hg init

    71

echo This is file a1 > a

    72

hg add a

    73

hg commit -t "commit #0" -d "0 0" -u user

    74

echo This is file b1 > b

    75

hg add b

    76

hg commit -t "commit #1" -d "0 0" -u user

    77

echo This is file b22 > b

    78

hg commit -t "commit #2" -d "0 0" -u user

    79

hg update 1

    80

echo This is file c1 > c

    81

hg add c

    82

hg commit -t "commit #3" -d "0 0" -u user

    83

echo This is file b33 > b

    84

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

    85

# merge of b expected

    86

cd ..; /bin/rm -rf t