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
===================================================================
+ hg --debug init
+ echo this is a1
+ hg add a
+ hg commit -t0 -d '0 0' -u user
+ echo this is b1
+ hg add b
+ hg commit -t1 -d '0 0' -u user
+ hg manifest 1
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
+ echo this is c1
+ hg rawcommit -p 1 -d '0 0' -u user -t2 c
+ hg manifest 2
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
+ hg parents
changeset: 2:c4ef0ef0554dff3ceade68d75539e4f208a2be0a
tag: tip
user: user
date: Thu Jan 1 00:00:00 1970
summary: 2
+ rm b
+ hg rawcommit -p 2 -d '0 0' -u user -t3 b
+ hg manifest 3
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
+ hg parents
changeset: 3:923669243607c26c4c8f0c11f48c1182ce1a7aff
tag: tip
user: user
date: Thu Jan 1 00:00:00 1970
summary: 3
+ echo this is a22
+ hg rawcommit -p 3 -d '0 0' -u user -t4 a
+ hg manifest 4
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
+ hg parents
changeset: 4:2361ec7b1da5142bce1285c50f3bb2960706263d
tag: tip
user: user
date: Thu Jan 1 00:00:00 1970
summary: 4
+ echo this is c22
+ hg rawcommit -p 1 -d '0 0' -u user -t5 c
+ hg manifest 5
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
+ hg parents
changeset: 4:2361ec7b1da5142bce1285c50f3bb2960706263d
user: user
date: Thu Jan 1 00:00:00 1970
summary: 4
+ hg rawcommit -p 4 -p 5 -d '0 0' -u user -t6
+ hg manifest 6
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
+ hg parents
changeset: 6:aaf55aee7b6249fd7d4ba295d98c4492ec2740d7
tag: tip
parent: 4:2361ec7b1da5142bce1285c50f3bb2960706263d
parent: 5:f8292b00383d88b470efcb2ea9c71409832ec9d6
user: user
date: Thu Jan 1 00:00:00 1970
summary: 6
+ hg rawcommit -p 6 -d '0 0' -u user -t7
+ hg manifest 7
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
+ hg parents
changeset: 7:836ff890ac9ecb8c4b7c209b3e8b93f8805ca5f0
tag: tip
user: user
date: Thu Jan 1 00:00:00 1970
summary: 7