##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

templatekw: change {file_copies} behaviour, add {file_copies_switch}...
templatekw: change {file_copies} behaviour, add {file_copies_switch} {file_copies} template now displays file copies with or without the --copies switch being set. A new {file_copies_switch} template implements the former behaviour.
Stuart W Marks - - Load All Authors

File last commit:

r9468:b2310903 default
r10060:f780b109 default
Show More
test-add.out
40 lines | 603 B | text/plain | TextLexer
/ tests / test-add.out
History | Annotation | Raw |Copy content |Copy permalink
adding a
? a
adding a
A a
adding a
A a
A a
? b
A a
A b
% should fail
b already tracked!
A a
A b
% should fail
a already tracked!
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
M a
? a.orig
% should fail
a already tracked!
M a
? a.orig
% issue683
? a.orig
R a
? a.orig
M a
? a.orig
c: No such file or directory
d: No such file or directory
M a
A c
? a.orig