2006-10-10 22:03:24 +04:00
|
|
|
% init foo-base
|
|
|
|
% create alpha in first repo
|
|
|
|
adding alpha
|
|
|
|
% clone foo-base to foo-work
|
2008-03-21 16:52:24 +03:00
|
|
|
updating working directory
|
2006-10-10 22:03:24 +04:00
|
|
|
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
|