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

repo          the name of the repo

     2

rev           a changeset.manifest revision

     3

node          a changeset node

     4

changesets    total number of changesets

     5

file          a filename

     6

filenode      a file node

     7

filerev       a file revision

     8

filerevs      total number of file revisions

     9

up            the directory of the relevant file

    10

path          a path in the manifest, starting with "/"

    11

basename      a short pathname

    12

manifest      a manifest node

    13

manifestrev   a manifest revision

    14

date          a date string

    15

age           age in hours, days, etc

    16

line          a line of text (escaped)

    17

desc          a description (escaped, with breaks)

    18

shortdesc         a short description (escaped)

    19

author        a name or email addressv(obfuscated)

    20

parent        a list of the parent

    21

tags          a list of tag

    22

    23

header        the global page header

    24

footer        the global page footer

    25

    26

files         a list of file links

    27

dirs          a set of directory links

    28

diff          a diff of one or more files

    29

annotate      an annotated file

    30

entries       the entries relevant to the page

    31

    32

Templates and commands:

    33

  changelog(rev) - a page for browsing changesets

    34

    naventry - a link for jumping to a changeset number

    35

    filenodelink - jump to file diff

    36

    fileellipses - printed after maxfiles

    37

    changelogentry - an entry in the log

    38

  manifest - browse a manifest as a directory tree