##// 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.
Adrian Buehlmann - - Load All Authors

File last commit:

r9611:a3d73b3e default
r10060:f780b109 default
Show More
test-manifest-merging.out
15 lines | 521 B | text/plain | TextLexer
/ tests / test-manifest-merging.out
History | Source | Raw |Copy content |Copy permalink
Giorgos Keramidas
Revert changeset c67920d78248....
 r3325 % init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Giorgos Keramidas
Revert changeset c67920d78248....
 r3325 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% create beta in second repo
adding beta
% create gamma in first repo
adding gamma
% pull into work and merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% revert to changeset 1 to simulate a failed merge
2 files updated, 0 files merged, 0 files removed, 0 files unresolved