Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/rss/map @ 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 | 105253b30239 |
children |
rev | line source |
---|---|
1901
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1766
diff
changeset
|
1 default = 'changelog' |
3276
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3227
diff
changeset
|
2 header = header.tmpl |
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3227
diff
changeset
|
3 changelog = changelog.tmpl |
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3227
diff
changeset
|
4 changelogentry = changelogentry.tmpl |
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3227
diff
changeset
|
5 filelog = filelog.tmpl |
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3227
diff
changeset
|
6 filelogentry = filelogentry.tmpl |
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3227
diff
changeset
|
7 tags = tags.tmpl |
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3227
diff
changeset
|
8 tagentry = tagentry.tmpl |