Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/map-cmdline.changelog @ 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 | e3280d350792 |
children |
rev | line source |
---|---|
2033
e3280d350792
Group changes done by the same developer on the same with --style=changelog
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2032
diff
changeset
|
1 header = '{date|shortdate} {author|person} <{author|email}>\n\n' |
e3280d350792
Group changes done by the same developer on the same with --style=changelog
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2032
diff
changeset
|
2 header_verbose = '' |
e3280d350792
Group changes done by the same developer on the same with --style=changelog
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2032
diff
changeset
|
3 changeset = '\t* {files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\t[{node|short}]{tags}\n\n' |
e3280d350792
Group changes done by the same developer on the same with --style=changelog
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2032
diff
changeset
|
4 changeset_quiet = '\t* {desc|firstline|fill68|tabindent|strip}\n\n' |
1987
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
5 changeset_verbose = '{date|isodate} {author|person} <{author|email}> ({node|short}{tags})\n\n\t* {file_adds|stringify|fill68|tabindent}{file_dels|stringify|fill68|tabindent}{files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\n' |
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 start_tags = ' [' |
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 tag = '{tag}, ' |
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
8 last_tag = '{tag}]' |
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
9 file = '{file}, ' |
2032
cd6bdbc508dd
Don't print filenames in braces for changelog style.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1987
diff
changeset
|
10 last_file = '{file}:\n\t' |
1987
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
11 file_add = '{file_add}, ' |
2032
cd6bdbc508dd
Don't print filenames in braces for changelog style.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1987
diff
changeset
|
12 last_file_add = '{file_add}: new file.\n* ' |
1987
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
13 file_del = '{file_del}, ' |
2032
cd6bdbc508dd
Don't print filenames in braces for changelog style.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1987
diff
changeset
|
14 last_file_del = '{file_del}: deleted file.\n* ' |