Mercurial > hg
diff tests/test-manifest-merging.out @ 3325: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 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-manifest-merging.out Tue Oct 10 21:03:24 2006 +0300 @@ -0,0 +1,21 @@ +% init foo-base +% create alpha in first repo +adding alpha +% clone foo-base to foo-work +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 +pulling from /tmp/hgtests.H64eVH/test-manifest-merging/foo-base +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +(run 'hg heads' to see heads, 'hg merge' to 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