Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/map-cmdline.compact @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
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}' |