view tests/test-flags.out @ 616:d45d1c90032e

Fix zombie files in merge
# HG changeset patch
# User [e-mail]
# 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
===================================================================

+ umask 027
+ mkdir test1
+ cd test1
+ hg init
+ touch a b
+ hg add a b
+ hg ci -t 'added a b' -u test -d '0 0'
+ cd ..
+ mkdir test2
+ cd test2
+ hg init
+ hg pull ../test1
pulling from ../test1
requesting all changes
adding changesets
adding manifests
adding file revisions
modified 2 files, added 1 changesets and 2 new revisions
(run 'hg update' to get a working copy)
+ hg co
+ chmod +x a
+ hg ci -t 'chmod +x a' -u test -d '0 0'
+ cd ../test1
+ echo 123
+ hg ci -t 'a updated' -u test -d '0 0'
+ hg pull ../test2
pulling from ../test2
searching for changes
adding changesets
adding manifests
adding file revisions
modified 1 files, added 1 changesets and 1 new revisions
(run 'hg update' to get a working copy)
+ hg heads
changeset:   2:3ef54330565526bebf37a0d9bf540c283fd133a1
tag:         tip
parent:      0:22a449e20da501ca558394c083ca470e9c81b9f7
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     chmod +x a

changeset:   1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     a updated

+ hg history
changeset:   2:3ef54330565526bebf37a0d9bf540c283fd133a1
tag:         tip
parent:      0:22a449e20da501ca558394c083ca470e9c81b9f7
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     chmod +x a

changeset:   1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     a updated

changeset:   0:22a449e20da501ca558394c083ca470e9c81b9f7
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     added a b

+ hg -v co -m
resolving manifests
merging a
resolving a
+ ls -l ../test1/a ../test2/a
+ cut -b 0-10
-rwxr-x---
-rwxr-x---