Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templates/changelog.tmpl
author maf46@burn.cl.cam.ac.uk
Mon, 04 Jul 2005 12:38:34 -0800
changeset 616 d45d1c90032e
parent 599 765182a4c843
child 661 148f642d1f8e
permissions -rw-r--r--
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 ===================================================================
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset 
     1
 
#header#
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents: 173
diff changeset 
     2
 
<title>#repo|escape#: changelog</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>
168
65cf1b0cfe86 hgweb: add tags links and manifest links
mpm@selenic.com
parents: 165
diff changeset 
     5
 












65cf1b0cfe86
hgweb: add tags links and manifest links



mpm@selenic.com


parents: 
165

diff
changeset




     6


<div class="buttons">













65cf1b0cfe86
hgweb: add tags links and manifest links



mpm@selenic.com


parents: 
165

diff
changeset




     7


<a href="?cmd=tags">tags</a>













65cf1b0cfe86
hgweb: add tags links and manifest links



mpm@selenic.com


parents: 
165

diff
changeset




     8


<a href="?cmd=manifest;manifest=#manifest#;path=/">manifest</a>








599






765182a4c843
[PATCH] Add RSS support to hgweb



mpm@selenic.com


parents: 
584

diff
changeset




     9


<a href="?cmd=changelog;style=rss">rss</a>








168






65cf1b0cfe86
hgweb: add tags links and manifest links



mpm@selenic.com


parents: 
165

diff
changeset




    10


</div>













65cf1b0cfe86
hgweb: add tags links and manifest links



mpm@selenic.com


parents: 
165

diff
changeset




    11









201






f918a6fa2572
hgweb: add template filters, template style maps, and raw pages



mpm@selenic.com


parents: 
173

diff
changeset




    12


<h2>changelog for #repo|escape#</h2>








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    13









584






9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.



mpm@selenic.com


parents: 
201

diff
changeset




    14


<form action="#">













9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.



mpm@selenic.com


parents: 
201

diff
changeset




    15


<p>













9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.



mpm@selenic.com


parents: 
201

diff
changeset




    16


<label for="search1">search:</label>








165






7fc8385df514
Add tag/rev/node search to hgweb



mpm@selenic.com


parents: 
142

diff
changeset




    17


<input type="hidden" name="cmd" value="changelog">








584






9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.



mpm@selenic.com


parents: 
201

diff
changeset




    18


<input name="rev" id="search1" type="text" size="30">













9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.



mpm@selenic.com


parents: 
201

diff
changeset




    19


navigate: <small>#changenav#</small>













9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.



mpm@selenic.com


parents: 
201

diff
changeset




    20


</p>








165






7fc8385df514
Add tag/rev/node search to hgweb



mpm@selenic.com


parents: 
142

diff
changeset




    21


</form>








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    22









142






529bf610092e
Prettify the web interface



mpm@selenic.com


parents: 
138

diff
changeset




    23


#entries#








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    24









584






9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.



mpm@selenic.com


parents: 
201

diff
changeset




    25


<form action="#">













9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.



mpm@selenic.com


parents: 
201

diff
changeset




    26


<p>













9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.



mpm@selenic.com


parents: 
201

diff
changeset




    27


<label for="search2">search:</label>








165






7fc8385df514
Add tag/rev/node search to hgweb



mpm@selenic.com


parents: 
142

diff
changeset




    28


<input type="hidden" name="cmd" value="changelog">








584






9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.



mpm@selenic.com


parents: 
201

diff
changeset




    29


<input name="rev" id="search2" type="text" size="30">













9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.



mpm@selenic.com


parents: 
201

diff
changeset




    30


navigate: <small>#changenav#</small>













9bdf5ae63d1f
[PATCH 2] ChangeLog template conformance fixes.



mpm@selenic.com


parents: 
201

diff
changeset




    31


</p>








165






7fc8385df514
Add tag/rev/node search to hgweb



mpm@selenic.com


parents: 
142

diff
changeset




    32


</form>








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    33









142






529bf610092e
Prettify the web interface



mpm@selenic.com


parents: 
138

diff
changeset




    34


#footer#















mercurial-crew-with-dirclash