tests/test-manifest-merging.out
author Matt Mackall <mpm@selenic.com>
Wed, 11 Oct 2006 15:52:08 -0500
changeset 3326 be8efb6e1cc6
parent 3325 50a18815e3f0
child 6338 0750f11152fe
permissions -rw-r--r--
make manifest-merging test reproduceable
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3325
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
     1
% init foo-base
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
     2
% create alpha in first repo
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
     3
adding alpha
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
     4
% clone foo-base to foo-work
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
     5
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
     6
% create beta in second repo
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
     7
adding beta
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
     8
% create gamma in first repo
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
     9
adding gamma
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    10
% pull into work and merge
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    11
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    12
(branch merge, don't forget to commit)
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    13
% revert to changeset 1 to simulate a failed merge
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    14
2 files updated, 0 files merged, 0 files removed, 0 files unresolved