annotate en/examples/branch-repo.pull.out @ 199:58e3a6c76725
More branch/merge stuff.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Mon Apr 16 17:37:27 2007 -0700 (2007-04-16) |
| parents |
|
| children |
2b8c6aa370d5 |
| rev |
line source |
|
bos@199
|
1 $ \textbf{cd ..}
|
|
bos@199
|
2 $ \textbf{hg clone myproject myproject-merge}
|
|
bos@199
|
3 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
bos@199
|
4 $ \textbf{cd myproject-merge}
|
|
bos@199
|
5 $ \textbf{hg pull ../myproject-1.0.1}
|
|
bos@199
|
6 pulling from ../myproject-1.0.1
|
|
bos@199
|
7 searching for changes
|
|
bos@199
|
8 adding changesets
|
|
bos@199
|
9 adding manifests
|
|
bos@199
|
10 adding file changes
|
|
bos@199
|
11 added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
bos@199
|
12 (run 'hg heads' to see heads, 'hg merge' to merge)
|
