Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-manifest-merging.out @ 3351:50a18815e3f0
Revert changeset c67920d78248.
It breaks 'hg merge && hg up -c REV' when files exist only in one of the
manifests, making hg throw a traceback like:
| author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
|---|---|
| date | Tue, 10 Oct 2006 21:03:24 +0300 |
| parents | |
| children | be8efb6e1cc6 |
comparison
equal
deleted
inserted
replaced
| 3324:34f08b8883cf | 3351:50a18815e3f0 |
|---|---|
| 1 % init foo-base | |
| 2 % create alpha in first repo | |
| 3 adding alpha | |
| 4 % clone foo-base to foo-work | |
| 5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 6 % create beta in second repo | |
| 7 adding beta | |
| 8 % create gamma in first repo | |
| 9 adding gamma | |
| 10 % pull into work and merge | |
| 11 pulling from /tmp/hgtests.H64eVH/test-manifest-merging/foo-base | |
| 12 searching for changes | |
| 13 adding changesets | |
| 14 adding manifests | |
| 15 adding file changes | |
| 16 added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 17 (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 18 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 19 (branch merge, don't forget to commit) | |
| 20 % revert to changeset 1 to simulate a failed merge | |
| 21 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |