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 t

     2

+ cd t

     3

+ hg init

     4

+ hg id

     5

unknown

     6

+ echo a

     7

+ hg add a

     8

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

     9

+ hg co

    10

+ hg identify

    11

acb14030fe0a tip

    12

++ hg -q tip

    13

++ cut -d : -f 2

    14

+ T=acb14030fe0a21b60322c440ad2d20cf7685a376

    15

+ echo 'acb14030fe0a21b60322c440ad2d20cf7685a376 first'

    16

+ cat .hgtags

    17

acb14030fe0a21b60322c440ad2d20cf7685a376 first

    18

+ hg add .hgtags

    19

+ hg commit -t 'add tags' -u test -d '0 0'

    20

+ hg tags

    21

tip                                1:b9154636be938d3d431e75a7c906504a079bfe07

    22

first                              0:acb14030fe0a21b60322c440ad2d20cf7685a376

    23

+ hg identify

    24

b9154636be93 tip

    25

+ echo bb

    26

+ hg status

    27

C a

    28

+ hg identify

    29

b9154636be93+ tip

    30

+ hg co first

    31

+ hg id

    32

acb14030fe0a+ first

    33

+ hg -v id

    34

acb14030fe0a21b60322c440ad2d20cf7685a376+ first

    35

+ hg status

    36

C a

    37

+ echo 1

    38

+ hg add b

    39

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

    40

+ hg id

    41

c8edf04160c7 tip

    42

+ hg co -m 1

    43

+ hg id

    44

c8edf04160c7+b9154636be93+ tip

    45

+ hg status

    46

C .hgtags

    47

C a