mercurial-crew-with-dirclash: templates/manifest.tmpl@d45d1c90032e (annotated)

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 ===================================================================

142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	1	#header#
375 b29219389b00 Show nice short hashes in hgweb mpm@selenic.com parents: 359 diff changeset	2	<title>#repo\|escape#: manifest #manifest\|short#</title>
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	3	</head>
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	4	<body>
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	5
154 1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes jake@edge2.net parents: 153 diff changeset	6	<div class="buttons">
153 e8a360cd5a9f changed pos to rev for changelog cmd, changed & to ; jake@edge2.net parents: 142 diff changeset	7	<a href="?cmd=changelog;rev=#rev#">changelog</a>
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 155 diff changeset	8	<a href="?cmd=tags">tags</a>
153 e8a360cd5a9f changed pos to rev for changelog cmd, changed & to ; jake@edge2.net parents: 142 diff changeset	9	<a href="?cmd=changeset;node=#node#">changeset</a>
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	10	</div>
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	11
375 b29219389b00 Show nice short hashes in hgweb mpm@selenic.com parents: 359 diff changeset	12	<h2>manifest #manifest\|short#: #path#</h2>
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: diff changeset	13
359 0c4688e9ee5c hgweb: add file permissions mpm@selenic.com parents: 201 diff changeset	14	<table cellpadding="0" cellspacing="0">
0c4688e9ee5c hgweb: add file permissions mpm@selenic.com parents: 201 diff changeset	15	<tr class="parity1">
0c4688e9ee5c hgweb: add file permissions mpm@selenic.com parents: 201 diff changeset	16	<td><tt>drwxr-xr-x</tt>
0c4688e9ee5c hgweb: add file permissions mpm@selenic.com parents: 201 diff changeset	17	<td><a href="?cmd=manifest;manifest=#manifest#;path=#up#">[up]</a>
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	18	#entries#
359 0c4688e9ee5c hgweb: add file permissions mpm@selenic.com parents: 201 diff changeset	19	</table>
153 e8a360cd5a9f changed pos to rev for changelog cmd, changed & to ; jake@edge2.net parents: 142 diff changeset	20	#footer#

author	maf46@burn.cl.cam.ac.uk
	Mon, 04 Jul 2005 12:38:34 -0800
changeset 616	d45d1c90032e
parent 377	e5d769afd3ef
child 979	87d40e085e08
child 980	5197fb9d65d5
child 981	4f81068ed8cd
permissions	-rw-r--r--