tests/test-rawcommit1.out
author maf46@burn.cl.cam.ac.uk
Mon, 04 Jul 2005 12:38:34 -0800
changeset 616 d45d1c90032e
parent 591 eb46971fc57f
child 749 7e4843b7efd2
permissions -rw-r--r--
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 ===================================================================
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
     1
+ hg --debug init
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     2
+ echo this is a1
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
     3
+ hg add a
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
     4
+ hg commit -t0 -d '0 0' -u user
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     5
+ echo this is b1
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
     6
+ hg add b
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
     7
+ hg commit -t1 -d '0 0' -u user
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
     8
+ hg manifest 1
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     9
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    10
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    11
+ echo this is c1
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    12
+ hg rawcommit -p 1 -d '0 0' -u user -t2 c
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    13
+ hg manifest 2
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    14
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    15
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    16
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    17
+ hg parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    18
changeset:   2:c4ef0ef0554dff3ceade68d75539e4f208a2be0a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    19
tag:         tip
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    20
user:        user
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    21
date:        Thu Jan  1 00:00:00 1970
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    22
summary:     2
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
    23
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    24
+ rm b
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    25
+ hg rawcommit -p 2 -d '0 0' -u user -t3 b
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    26
+ hg manifest 3
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    27
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    28
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    29
+ hg parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    30
changeset:   3:923669243607c26c4c8f0c11f48c1182ce1a7aff
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    31
tag:         tip
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    32
user:        user
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    33
date:        Thu Jan  1 00:00:00 1970
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    34
summary:     3
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
    35
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    36
+ echo this is a22
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    37
+ hg rawcommit -p 3 -d '0 0' -u user -t4 a
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    38
+ hg manifest 4
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    39
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    40
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    41
+ hg parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    42
changeset:   4:2361ec7b1da5142bce1285c50f3bb2960706263d
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    43
tag:         tip
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    44
user:        user
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    45
date:        Thu Jan  1 00:00:00 1970
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    46
summary:     4
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
    47
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    48
+ echo this is c22
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    49
+ hg rawcommit -p 1 -d '0 0' -u user -t5 c
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    50
+ hg manifest 5
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    51
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    52
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    53
3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    54
+ hg parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    55
changeset:   4:2361ec7b1da5142bce1285c50f3bb2960706263d
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    56
user:        user
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    57
date:        Thu Jan  1 00:00:00 1970
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    58
summary:     4
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    59
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    60
+ hg rawcommit -p 4 -p 5 -d '0 0' -u user -t6
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    61
+ hg manifest 6
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    62
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    63
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    64
+ hg parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    65
changeset:   6:aaf55aee7b6249fd7d4ba295d98c4492ec2740d7
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    66
tag:         tip
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    67
parent:      4:2361ec7b1da5142bce1285c50f3bb2960706263d
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    68
parent:      5:f8292b00383d88b470efcb2ea9c71409832ec9d6
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    69
user:        user
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    70
date:        Thu Jan  1 00:00:00 1970
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    71
summary:     6
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    72
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    73
+ hg rawcommit -p 6 -d '0 0' -u user -t7
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    74
+ hg manifest 7
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    75
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    76
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    77
+ hg parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    78
changeset:   7:836ff890ac9ecb8c4b7c209b3e8b93f8805ca5f0
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    79
tag:         tip
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    80
user:        user
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    81
date:        Thu Jan  1 00:00:00 1970
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    82
summary:     7
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    83