Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/map-cmdline.compact @ 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 | 8f565af14095 |
children |
rev | line source |
---|---|
1914
a5bf0030df5f
make --style=compact look for map-cmdline.compact.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1913
diff
changeset
|
1 changeset = '{rev}{tags}{parents} {node|short} {date|isodate} {author|user}\n {desc|firstline|strip}\n\n' |
1919
8f565af14095
add changeset_quiet to templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1914
diff
changeset
|
2 changeset_quiet = '{rev}:{node|short}\n' |
1908
be71c04d62c0
print tags in compact template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1907
diff
changeset
|
3 start_tags = '[' |
be71c04d62c0
print tags in compact template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1907
diff
changeset
|
4 tag = '{tag},' |
be71c04d62c0
print tags in compact template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1907
diff
changeset
|
5 last_tag = '{tag}]' |
1907
7718885070b1
let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 start_parents = ':' |
7718885070b1
let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 parent = '{rev},' |
7718885070b1
let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
8 last_parent = '{rev}' |