Mercurial > hg
view tests/test-manifest-merging.out @ 11295:07e425d63dbd
tests: use --debug on test-clone
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Thu, 03 Jun 2010 13:58:00 +0200 |
parents | a3d73b3e1f8a |
children |
line wrap: on
line source
% init foo-base % create alpha in first repo adding alpha % clone foo-base to foo-work updating to branch default 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