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

+ hg init

     2

+ echo a

     3

+ hg add a

     4

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

     5

+ hg status

     6

? .out

     7

+ cp a b

     8

+ hg copy a b

     9

+ hg status

    10

A b

    11

? .out

    12

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

    13

b

    14

 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3

    15

+ hg history

    16

changeset:   1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8

    17

tag:         tip

    18

user:        test

    19

date:        Thu Jan  1 00:00:00 1970

    20

summary:     2

    21

    22

changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e

    23

user:        test

    24

date:        Thu Jan  1 00:00:00 1970

    25

summary:     1

    26

    27

+ hg log a

    28

revision:    0:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3

    29

changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e

    30

user:        test

    31

date:        Thu Jan  1 00:00:00 1970

    32

summary:     1

    33

    34

+ hexdump -C .hg/data/b.d

    35

00000000  75 01 0a 63 6f 70 79 72  65 76 3a 20 62 37 38 39  |u..copyrev: b789|

    36

00000010  66 64 64 39 36 64 63 32  66 33 62 64 32 32 39 63  |fdd96dc2f3bd229c|

    37

00000020  31 64 64 38 65 65 64 66  30 66 63 36 30 65 32 62  |1dd8eedf0fc60e2b|

    38

00000030  36 38 65 33 0a 63 6f 70  79 3a 20 61 0a 01 0a 61  |68e3.copy: a...a|

    39

00000040  0a                                                |.|

    40

00000041

    41

+ hg cat b

    42

+ md5sum bsum

    43

60b725f10c9c85c70d97880dfe8191b3  bsum

    44

+ hg cat a

    45

+ md5sum asum

    46

60b725f10c9c85c70d97880dfe8191b3  asum

    47

+ hg verify

    48

checking changesets

    49

checking manifests

    50

crosschecking files in changesets and manifests

    51

checking files

    52

2 files, 2 changesets, 2 total revisions