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

General:

     2

- Better documentation

     3

- More regression tests

     4

- More specific try/except.

     5

- less code duplication, more code in the right places

     6

- python 2.2 support

     7

- better import support

     8

- export to git

     9

- Code cleanup: apply http://python.org/peps/pep-0008.html

    10

    11

Core:

    12

- difflib creating/removing files (fixed except dates: should be epoch)

    13

- directory foo.d or foo.i with existing file foo (use some quoting?)

    14

- get various options from hgrc (e.g. history always -v, tip always -q)

    15

- better push support (hack exists)

    16

- hg over ssh:// and https:// and rsync://

    17

- hooks for new changesets getting pulled/imported etc.

    18

- make showing removed files (in history etc.) faster.

    19

    20

Commands:

    21

- hg add <directory> should work

    22

- hg status <filename>: file rev, changeset rev, changed, added,

    23

  deleted, sha-1

    24

- select to pull a subset of the heads

    25

- commands.py: number of args too much magic (e.g. in patch())

    26

- automatic pull fallback to old-http://

    27

- optionally only show merges (two parents or parent != changeset-1, etc.)

    28

    29

Web:

    30

- optionally only show merges (two parents or parent != changeset-1, etc.)

    31

- one hgweb with many repos (another script)

    32

- hgweb tip link too verbose

    33

- hgweb: deliver static files (e.g. favicon, stylesheets)

    34

- hgweb personalization: timezone (display/change), display of

    35

  features

    36

- hg export 240 shows -tkmerge (good), hgweb does not (bad).

    37

- some web servers think hgweb.cgi.[di] is a CGI script with old-http://

    38

  (use quoting (see foo.d in Core) or document server configurations?)

    39

- link children in hgweb