diff --git a/mercurial/templates/map-cmdline.default b/mercurial/templates/map-cmdline.default --- a/mercurial/templates/map-cmdline.default +++ b/mercurial/templates/map-cmdline.default @@ -14,9 +14,9 @@ end_file_adds = '\n' start_file_dels = 'files-: ' file_del = ' {file_del}' end_file_dels = '\n' -start_file_copies_switch = 'copies: ' +start_file_copies = 'copies: ' file_copy = ' {name} ({source})' -end_file_copies_switch = '\n' +end_file_copies = '\n' parent = 'parent: {rev}:{node|formatnode}\n' manifest = 'manifest: {rev}:{node}\n' branch = 'branch: {branch}\n' diff --git a/tests/test-log b/tests/test-log --- a/tests/test-log +++ b/tests/test-log @@ -38,6 +38,10 @@ hg log -v --template '{rev} {file_copies echo '% log copies switch with --copies' hg log -vC --template '{rev} {file_copies_switch}\n' +echo '% log copies with hardcoded style and with --style=default' +hg log -vC -r4 +hg log -vC -r4 --style=default + echo % log copies, non-linear manifest hg up -C 3 hg mv dir/b e diff --git a/tests/test-log.out b/tests/test-log.out --- a/tests/test-log.out +++ b/tests/test-log.out @@ -94,6 +94,27 @@ 3 b (a) 2 dir/b (b) 1 b (a) 0 +% log copies with hardcoded style and with --style=default +changeset: 4:66c1345dc4f9 +tag: tip +user: test +date: Thu Jan 01 00:00:05 1970 +0000 +files: dir/b e +copies: e (dir/b) +description: +e + + +changeset: 4:66c1345dc4f9 +tag: tip +user: test +date: Thu Jan 01 00:00:05 1970 +0000 +files: dir/b e +copies: e (dir/b) +description: +e + + % log copies, non-linear manifest 1 files updated, 0 files merged, 1 files removed, 0 files unresolved adding foo