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

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

convert: cvs.py - Allow user to use built-in CVS changeset code....
convert: cvs.py - Allow user to use built-in CVS changeset code. tests: add two testcases for CVS conversion with builtin CVS including a testcase for issue 1148.
Adrian Buehlmann - - Load All Authors

File last commit:

r6338:0750f111 default
r6690:127e8c34 default
Show More
test-manifest-merging.out
15 lines | 521 B | text/plain | TextLexer
/ tests / test-manifest-merging.out
History | Annotation | Raw |Copy content |Copy permalink
% init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
updating working directory
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