hgbook
annotate en/examples/rename.divergent.merge.out @ 193:8b33c890e777
Something interesting happened, but I don't have time to look and see.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Apr 16 14:41:21 2007 -0700 (2007-04-16) |
parents | 91a936be78b8 |
children | 50223e198614 |
rev | line source |
---|---|
bos@156 | 1 # See http://www.selenic.com/mercurial/bts/issue455 |
bos@156 | 2 $ \textbf{cd ../orig} |
bos@156 | 3 $ \textbf{hg pull -u ../anne} |
bos@156 | 4 pulling from ../anne |
bos@156 | 5 searching for changes |
bos@156 | 6 adding changesets |
bos@156 | 7 adding manifests |
bos@156 | 8 adding file changes |
bos@156 | 9 added 1 changesets with 1 changes to 1 files |
bos@193 | 10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bos@156 | 11 $ \textbf{hg pull ../bob} |
bos@156 | 12 pulling from ../bob |
bos@156 | 13 searching for changes |
bos@156 | 14 adding changesets |
bos@156 | 15 adding manifests |
bos@156 | 16 adding file changes |
bos@156 | 17 added 1 changesets with 1 changes to 1 files (+1 heads) |
bos@156 | 18 (run 'hg heads' to see heads, 'hg merge' to merge) |
bos@156 | 19 $ \textbf{hg merge} |
bos@156 | 20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bos@156 | 21 (branch merge, don't forget to commit) |
bos@156 | 22 $ \textbf{ls} |
bos@156 | 23 bar quux |