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
===================================================================
basic hg commands (use "hg help -v" for more):
add add the specified files on the next commit
annotate show changeset information per file line
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff working directory (or selected files)
export dump the header and diffs for one or more changesets
init create a new repository in the current directory
log show the revision history of the repository or a single file
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
revert revert modified files or dirs back to their unmodified states
serve export the repository via HTTP
status show changed files in the working directory
update update or merge working directory
basic hg commands (use "hg help -v" for more):
add add the specified files on the next commit
annotate show changeset information per file line
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff working directory (or selected files)
export dump the header and diffs for one or more changesets
init create a new repository in the current directory
log show the revision history of the repository or a single file
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
revert revert modified files or dirs back to their unmodified states
serve export the repository via HTTP
status show changed files in the working directory
update update or merge working directory
hg add: option -h not recognized
hg add [files]
add the specified files on the next commit
hg add: option --skjdfks not recognized
hg add [files]
add the specified files on the next commit
hg diff [-r A] [-r B] [files]
-r --rev
revision
diff working directory (or selected files)
hg: unknown command foo
hg: unknown command 'commands'
basic hg commands (use "hg help -v" for more):
add add the specified files on the next commit
annotate show changeset information per file line
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff working directory (or selected files)
export dump the header and diffs for one or more changesets
init create a new repository in the current directory
log show the revision history of the repository or a single file
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
revert revert modified files or dirs back to their unmodified states
serve export the repository via HTTP
status show changed files in the working directory
update update or merge working directory