Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/raw/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 | de081fbb27fe |
children |
rev | line source |
---|---|
3276
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3228
diff
changeset
|
1 header = header.tmpl |
1901
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
2 footer = '' |
3276
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3228
diff
changeset
|
3 changeset = changeset.tmpl |
1901
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
4 difflineplus = '#line#' |
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
5 difflineminus = '#line#' |
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
6 difflineat = '#line#' |
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
7 diffline = '#line#' |
2520
e30f425a4b2c
make changeset outputted by the raw template to be closer to 'hg export'
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2094
diff
changeset
|
8 changesetparent = '# Parent #node#' |
e30f425a4b2c
make changeset outputted by the raw template to be closer to 'hg export'
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2094
diff
changeset
|
9 changesetchild = '# Child #node#' |
1901
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
10 filenodelink = '' |
2534
d5a3cc6520d5
Fix raw files in the web UI.
Eric Hopper <hopper@omnifarious.org>
parents:
2094
diff
changeset
|
11 filerevision = '#rawfileheader##raw#' |
1901
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
12 fileline = '#line#' |
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
13 diffblock = '#lines#' |
3276
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3228
diff
changeset
|
14 filediff = filediff.tmpl |
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3228
diff
changeset
|
15 fileannotate = fileannotate.tmpl |
1901
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
16 annotateline = '#author#@#rev#: #line#' |
3935
472d9670e6e9
hgweb: add raw manifest template
Brendan Cully <brendan@kublai.com>
parents:
3276
diff
changeset
|
17 manifest = manifest.tmpl |
472d9670e6e9
hgweb: add raw manifest template
Brendan Cully <brendan@kublai.com>
parents:
3276
diff
changeset
|
18 manifestdirentry = 'drwxr-xr-x {basename}\n' |
472d9670e6e9
hgweb: add raw manifest template
Brendan Cully <brendan@kublai.com>
parents:
3276
diff
changeset
|
19 manifestfileentry = '{permissions|permissions} {size} {basename}\n' |
4024
de081fbb27fe
hgweb: add raw template to hgwebdir
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3935
diff
changeset
|
20 index = index.tmpl |
de081fbb27fe
hgweb: add raw template to hgwebdir
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3935
diff
changeset
|
21 indexentry = '#url#\n' |