Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-manifest-merging.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 11 Oct 2007 16:19:12 +0200
changeset 5454 f2ca8d2c988f
parent 3352 be8efb6e1cc6
permissions -rw-r--r--
explicitely use integer division
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3351
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
mercurial-crew-with-dirclash