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

A simple testing framework

     2

     3

To run the tests, do:

     4

     5

cd tests/

     6

./run-tests

     7

     8

This finds all scripts in the test directory named test-* and executes

     9

them. The scripts can be either shell scripts or Python. Each test is

    10

run in a temporary directory that is removed when the test is complete.

    11

    12

A test-<x> succeeds if the script returns success and its output

    13

matches test-<x>.out. If the new output doesn't match, it is stored in

    14

test-<x>.err.

    15

    16

There are some tricky points here that you should be aware of when

    17

writing tests:

    18

    19

- hg commit and hg up -m want user interaction

    20

    21

  for commit use -t "text"

    22

  for hg up -m, set HGMERGE to something noninteractive (like true or merge)

    23

    24

- changeset hashes will change based on user and date which make

    25

  things like hg history output change

    26

    27

  use commit -t "test" -u test -d "0 0"

    28

    29

- diff will show the current time

    30

    31

  use hg diff | sed "s/\(\(---\|+++\).*\)\t.*/\1/" to strip dates

    32

    33

- set -x and pipelines don't generate stable output

    34

    35

  turn off set -x or break pipelines into pieces

    36