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

+ umask 027

     2

+ mkdir test1

     3

+ cd test1

     4

+ hg init

     5

+ touch a b

     6

+ hg add a b

     7

+ hg ci -t 'added a b' -u test -d '0 0'

     8

+ cd ..

     9

+ mkdir test2

    10

+ cd test2

    11

+ hg init

    12

+ hg pull ../test1

    13

pulling from ../test1

    14

requesting all changes

    15

adding changesets

    16

adding manifests

    17

adding file revisions

    18

modified 2 files, added 1 changesets and 2 new revisions

    19

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

    20

+ hg co

    21

+ chmod +x a

    22

+ hg ci -t 'chmod +x a' -u test -d '0 0'

    23

+ cd ../test1

    24

+ echo 123

    25

+ hg ci -t 'a updated' -u test -d '0 0'

    26

+ hg pull ../test2

    27

pulling from ../test2

    28

searching for changes

    29

adding changesets

    30

adding manifests

    31

adding file revisions

    32

modified 1 files, added 1 changesets and 1 new revisions

    33

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

    34

+ hg heads

    35

changeset:   2:3ef54330565526bebf37a0d9bf540c283fd133a1

    36

tag:         tip

    37

parent:      0:22a449e20da501ca558394c083ca470e9c81b9f7

    38

user:        test

    39

date:        Thu Jan  1 00:00:00 1970

    40

summary:     chmod +x a

    41

    42

changeset:   1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5

    43

user:        test

    44

date:        Thu Jan  1 00:00:00 1970

    45

summary:     a updated

    46

    47

+ hg history

    48

changeset:   2:3ef54330565526bebf37a0d9bf540c283fd133a1

    49

tag:         tip

    50

parent:      0:22a449e20da501ca558394c083ca470e9c81b9f7

    51

user:        test

    52

date:        Thu Jan  1 00:00:00 1970

    53

summary:     chmod +x a

    54

    55

changeset:   1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5

    56

user:        test

    57

date:        Thu Jan  1 00:00:00 1970

    58

summary:     a updated

    59

    60

changeset:   0:22a449e20da501ca558394c083ca470e9c81b9f7

    61

user:        test

    62

date:        Thu Jan  1 00:00:00 1970

    63

summary:     added a b

    64

    65

+ hg -v co -m

    66

resolving manifests

    67

merging a

    68

resolving a

    69

+ ls -l ../test1/a ../test2/a

    70

+ cut -b 0-10

    71

-rwxr-x---

    72

-rwxr-x---