Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/changelogentry.tmpl @ 5045:f191bc3916f7
merge: do early copy to deal with issue636
Without copies/renames, merges source names are 1:1 with their
targets. Copies and renames introduce the possibility that there will
be two merges with the same input but different output. By doing the
copy to the destination name before the merge, the actual merge
becomes 1:1 again, and no source is the input to two different merges.
- add a preliminary scan to applyupdates to do copies
- for the merge action, pass the old name (for finding ancestors) and
the new name (for input to the merge) to filemerge
- eliminate the old post-merge copy
- lookup file contents from new name in filemerge
- pass new name to external merge helper
- report merge failure at new name
- add a test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Aug 2007 12:33:12 -0500 |
parents | ce8f31e0b3b8 |
children |
rev | line source |
---|---|
2132
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1606
diff
changeset
|
1 <table class="logEntry parity#parity#"> |
585 | 2 <tr> |
2132
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1606
diff
changeset
|
3 <th class="age">#date|age# ago:</th> |
1445
56281e086f38
hgweb: add strip and rstrip filters to handle summary
TK Soh <teekaysoh@yahoo.com>
parents:
1416
diff
changeset
|
4 <th class="firstline">#desc|strip|firstline|escape#</th> |
585 | 5 </tr> |
6 <tr> | |
2132
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1606
diff
changeset
|
7 <th class="revision">changeset #rev#:</th> |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
8 <td class="node"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td> |
585 | 9 </tr> |
1416
19d2776f1725
hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1410
diff
changeset
|
10 #parent%changelogparent# |
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1445
diff
changeset
|
11 #child%changelogchild# |
585 | 12 #changelogtag# |
13 <tr> | |
14 <th class="author">author:</th> | |
15 <td class="author">#author|obfuscate#</td> | |
16 </tr> | |
17 <tr> | |
18 <th class="date">date:</th> | |
19 <td class="date">#date|date#</td> | |
20 </tr> | |
21 <tr> | |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
22 <th class="files"><a href="#url#file/#node|short#{sessionvars%urlparameter}">files</a>:</th> |
585 | 23 <td class="files">#files#</td> |
24 </tr> | |
1334
0843e1bf2b97
hgweb: fixed IE display problem on changelog page
TK Soh <teekaysoh@yahoo.com>
parents:
585
diff
changeset
|
25 </table> |