Mercurial > hg
view tests/test-manifest-merging.out @ 7594:a204547790bc
test: added testcase for cvsps log message lookahead
author | Frank Kingswood <frank@kingswood-consulting.co.uk> |
---|---|
date | Sun, 04 Jan 2009 10:06:44 +0000 |
parents | 0750f11152fe |
children | a3d73b3e1f8a |
line wrap: on
line source
% 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