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

#!/bin/sh -e

     2

     3

export LANG=C

     4

export LC_CTYPE="C"

     5

export LC_NUMERIC="C"

     6

export LC_TIME="C"

     7

export LC_COLLATE="C"

     8

export LC_MONETARY="C"

     9

export LC_MESSAGES="C"

    10

export LC_PAPER="C"

    11

export LC_NAME="C"

    12

export LC_ADDRESS="C"

    13

export LC_TELEPHONE="C"

    14

export LC_MEASUREMENT="C"

    15

export LC_IDENTIFICATION="C"

    16

export LC_ALL=""

    17

    18

umask 022

    19

    20

tests=0

    21

failed=0

    22

H=$PWD

    23

    24

if [ -d /usr/lib64 ]; then

    25

    lib=lib64

    26

else

    27

    lib=lib

    28

fi

    29

    30

TESTPATH=$PWD/install/bin

    31

export PATH=$TESTPATH:$PATH

    32

export PYTHONPATH=$PWD/install/$lib/python

    33

    34

rm -rf install

    35

cd ..

    36

${PYTHON:-python} setup.py install --home=tests/install > tests/install.err

    37

if [ $? != 0 ] ; then

    38

    cat tests/install.err

    39

fi

    40

cd $H

    41

rm install.err

    42

    43

function run_one

    44

{

    45

    rm -f $1.err

    46

    export TZ=GMT

    47

    D=`mktemp -d`

    48

    if [ "$D" = "" ] ; then

    49

	echo mktemp failed!

    50

    fi

    51

    52

    cd $D

    53

    fail=0

    54

    export HOME=$D

    55

    56

    if ! $H/$1 > .out 2>&1 ; then

    57

	echo $1 failed with error code $?

    58

	fail=1

    59

    fi

    60

    61

    if [ -s .out -a ! -r $H/$1.out ] ; then

    62

	echo $1 generated unexpected output:

    63

	cat .out

    64

	cp .out $H/$1.err

    65

	fail=1

    66

    elif [ -r $H/$1.out ] && ! diff -u $H/$1.out .out > /dev/null ; then

    67

	echo $1 output changed:

    68

	diff -u $H/$1.out .out && true

    69

	cp .out $H/$1.err

    70

	fail=1

    71

    fi

    72

    73

    cd $H

    74

    rm -r $D

    75

    return $fail

    76

}

    77

    78

TESTS=$@

    79

if [ "$TESTS" = "" ] ; then

    80

    TESTS=`ls test-* | grep -Ev "\.|~"`

    81

fi

    82

    83

for f in $TESTS ; do

    84

    echo -n "."

    85

    if ! run_one $f ; then

    86

	failed=$[$failed + 1]

    87

    fi

    88

    tests=$[$tests + 1]

    89

done

    90

    91

rm -rf install

    92

    93

echo

    94

echo Ran $tests tests, $failed failed

    95

    96

if [ $failed -gt 0 ] ; then

    97

    exit 1

    98

fi

    99