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/fileannotate.tmpl
author maf46@burn.cl.cam.ac.uk
Mon, 04 Jul 2005 12:38:34 -0800
changeset 616 d45d1c90032e
parent 570 2ee819a950aa
child 977 289975641886
child 980 5197fb9d65d5
child 981 4f81068ed8cd
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: 168
diff changeset 
     2
 
<title>#repo|escape#: #file# annotate</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: 
167

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>













e8a360cd5a9f
changed pos to rev for changelog cmd, changed & to ;



jake@edge2.net


parents: 
142

diff
changeset




    10


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













e8a360cd5a9f
changed pos to rev for changelog cmd, changed & to ;



jake@edge2.net


parents: 
142

diff
changeset




    11


<a href="?cmd=file;file=#file#;filenode=#filenode#">file</a>













e8a360cd5a9f
changed pos to rev for changelog cmd, changed & to ;



jake@edge2.net


parents: 
142

diff
changeset




    12


<a href="?cmd=filelog;file=#file#;filenode=#filenode#">revisions</a>








142






529bf610092e
Prettify the web interface



mpm@selenic.com


parents: 
138

diff
changeset




    13


</div>








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    14









375






b29219389b00
Show nice short hashes in hgweb



mpm@selenic.com


parents: 
359

diff
changeset




    15


<h2>Annotate #file# (#filenode|short#)</h2>








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    16














c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    17


<table>













c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    18


<tr>








167






fad9ad1ec7c7
Hide most revision numbers in hgweb



mpm@selenic.com


parents: 
155

diff
changeset




    19


 <td class="metatag">changeset #rev#:</td>








375






b29219389b00
Show nice short hashes in hgweb



mpm@selenic.com


parents: 
359

diff
changeset




    20


 <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>








570






2ee819a950aa
[PATCH 2/5]: cleaning the template parent management in hgweb



mpm@selenic.com


parents: 
377

diff
changeset




    21


#parent#








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    22


<tr>








154






1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes



jake@edge2.net


parents: 
153

diff
changeset




    23


 <td class="metatag">manifest:</td>








375






b29219389b00
Show nice short hashes in hgweb



mpm@selenic.com


parents: 
359

diff
changeset




    24


 <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest|short#</a></td></tr>








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    25


<tr>








154






1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes



jake@edge2.net


parents: 
153

diff
changeset




    26


 <td class="metatag">author:</td>








201






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



mpm@selenic.com


parents: 
168

diff
changeset




    27


 <td>#author|obfuscate#</td></tr>








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    28


<tr>








154






1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes



jake@edge2.net


parents: 
153

diff
changeset




    29


 <td class="metatag">date:</td>








236






85f0420fd848
Removed extra closing brace from date string.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
201

diff
changeset




    30


 <td>#date|date# (#date|age# ago)</td></tr>








359






0c4688e9ee5c
hgweb: add file permissions



mpm@selenic.com


parents: 
241

diff
changeset




    31


<tr>













0c4688e9ee5c
hgweb: add file permissions



mpm@selenic.com


parents: 
241

diff
changeset




    32


 <td class="metatag">permissions:</td>













0c4688e9ee5c
hgweb: add file permissions



mpm@selenic.com


parents: 
241

diff
changeset




    33


 <td>#permissions|permissions#</td></tr>








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    34


</table>













c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    35









142






529bf610092e
Prettify the web interface



mpm@selenic.com


parents: 
138

diff
changeset




    36


<br/>








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    37









154






1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes



jake@edge2.net


parents: 
153

diff
changeset




    38


<table cellspacing="0" cellpadding="0">








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    39


#annotate#













c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    40


</table>













c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    41









142






529bf610092e
Prettify the web interface



mpm@selenic.com


parents: 
138

diff
changeset




    42


#footer#















mercurial-crew-with-dirclash