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

HGMERGE(1)

     2

==========

     3

Matt Mackall <mpm@selenic.com>

     4

v0.1, 27 May 2005

     5

     6

NAME

     7

----

     8

hgmerge - default wrapper to merge files in Mercurial SCM system

     9

    10

SYNOPSIS

    11

--------

    12

'hgmerge' local ancestor remote

    13

    14

DESCRIPTION

    15

-----------

    16

The hgmerge(1) command provides a graphical interface to merge files in the

    17

Mercurial system. It is a simple wrapper around kdiff3, merge(1) and tkdiff(1),

    18

or simply diff(1) and patch(1) depending on what is present on the system.

    19

    20

hgmerge(1) is used by the Mercurial SCM if the environment variable HGMERGE is

    21

not set.

    22

    23

AUTHOR

    24

------

    25

Written by Vincent Danjean <Vincent.Danjean@free.fr>

    26

    27

SEE ALSO

    28

--------

    29

hg(1) - the command line interface to Mercurial SCM

    30

    31

COPYING

    32

-------

    33

Copyright (C) 2005 Matt Mackall.

    34

Free use of this software is granted under the terms of the GNU General

    35

Public License (GPL).