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/map
author maf46@burn.cl.cam.ac.uk
Mon, 04 Jul 2005 12:38:34 -0800
changeset 616 d45d1c90032e
parent 602 56d81b303656
child 672 dbe0ce2ae196
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 = header.tmpl
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset 
     2
 
footer = footer.tmpl
538
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents: 380
diff changeset 
     3
 
search = search.tmpl
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     4
 
changelog = changelog.tmpl
173
8da1df932c16 hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents: 172
diff changeset 
     5
 
naventry = "<a href="?cmd=changelog;rev=#rev#">#label#</a> "
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     6
 
filedifflink = "<a href="?cmd=filediff;node=#node#;file=#file#">#file#</a> "
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     7
 
filenodelink = "<a href="?cmd=file;filenode=#filenode#;file=#file#">#file#</a> "
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     8
 
fileellipses = "..."
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     9
 
changelogentry = changelogentry.tmpl
538
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents: 380
diff changeset 
    10
 
searchentry = searchentry.tmpl
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    11
 
changeset = changeset.tmpl
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    12
 
manifest = manifest.tmpl
359
0c4688e9ee5c hgweb: add file permissions
mpm@selenic.com
parents: 241
diff changeset 
    13
 
manifestdirentry = "<tr class="parity#parity#"><td><tt>drwxr-xr-x</tt>&nbsp;<td><a href="?cmd=manifest;manifest=#manifest#;path=#path#">#basename#/</a>"
0c4688e9ee5c hgweb: add file permissions
mpm@selenic.com
parents: 241
diff changeset 
    14
 
manifestfileentry = "<tr class="parity#parity#"><td><tt>#permissions|permissions#</tt>&nbsp;<td><a href="?cmd=file;filenode=#filenode#;file=#file#">#basename#</a>"
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    15
 
filerevision = filerevision.tmpl
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    16
 
fileannotate = fileannotate.tmpl
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    17
 
filediff = filediff.tmpl
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    18
 
filelog = filelog.tmpl
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents: 173
diff changeset 
    19
 
fileline = "<div class="parity#parity#"><span class="lineno">#linenumber# </span>#line|escape#</div>"
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    20
 
filelogentry = filelogentry.tmpl
235
eb341488aa4c Obfuscate author in all HTML templates.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 201
diff changeset 
    21
 
annotateline = "<tr class="parity#parity#"><td class="annotate"><a href="?cmd=changeset;node=#node#">#author|obfuscate#@#rev#</a></td><td><pre>#line|escape#</pre></td></tr>"
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    22
 
difflineplus = "<li class="plusline">#line|escape#</li>"
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    23
 
difflineminus = "<li class="minusline">#line|escape#</li>"
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    24
 
difflineat = "<li class="atline">#line|escape#</li>"
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    25
 
diffline = "<li>#line|escape#</li>"
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    26
 
changelogparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>"
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    27
 
changesetparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>"
375
b29219389b00 Show nice short hashes in hgweb
mpm@selenic.com
parents: 359
diff changeset 
    28
 
filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=file;file=#file#;filenode=#node#">#node|short#</a></td></tr>"
b29219389b00 Show nice short hashes in hgweb
mpm@selenic.com
parents: 359
diff changeset 
    29
 
fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=annotate;file=#file#;filenode=#node#">#node|short#</a></td></tr>"
168
65cf1b0cfe86 hgweb: add tags links and manifest links
mpm@selenic.com
parents: 167
diff changeset 
    30
 
tags = tags.tmpl
586
11578820b5d7 [PATCH] Tags template cleanup
mpm@selenic.com
parents: 585
diff changeset 
    31
 
tagentry = "<li class="tagEntry parity#parity#"><span class="node">#node#</span> <a href="?cmd=changeset;node=#node#">#tag#</a></li>"
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    32
 
diffblock = "<ul class="parity#parity#">#lines#</ul>"
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    33
 
changelogtag = "<tr><th class="tag">tag:</th><td class="tag">#tag#</td></tr>"
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    34
 
changesettag = "<tr><th class="tag">tag:</th><td class="tag">#tag#</td></tr>"
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    35
 
filediffparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>"
598
f8d44a2e6928 [PATCH 4/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents: 586
diff changeset 
    36
 
filelogparent = "<tr><td align="right">parent #rev#:&nbsp;</td><td><a href="?cmd=file;file=#file#;filenode=#node#">#node|short#</a></td></tr>"
mercurial-crew-with-dirclash