annotate en/examples/branch-repo.pull.out @ 306:1b52bda675d0
Fix sample output for 'tour' test.
| author |
Guido Ostkamp <hg@ostkamp.fastmail.fm> |
| date |
Wed Aug 20 22:08:24 2008 +0200 (2008-08-20) |
| parents |
58e3a6c76725 |
| children |
|
| rev |
line source |
|
bos@199
|
1 $ \textbf{cd ..}
|
|
bos@199
|
2 $ \textbf{hg clone myproject myproject-merge}
|
|
hg@298
|
3 updating working directory
|
|
bos@199
|
4 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
bos@199
|
5 $ \textbf{cd myproject-merge}
|
|
bos@199
|
6 $ \textbf{hg pull ../myproject-1.0.1}
|
|
bos@199
|
7 pulling from ../myproject-1.0.1
|
|
bos@199
|
8 searching for changes
|
|
bos@199
|
9 adding changesets
|
|
bos@199
|
10 adding manifests
|
|
bos@199
|
11 adding file changes
|
|
bos@199
|
12 added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
bos@199
|
13 (run 'hg heads' to see heads, 'hg merge' to merge)
|
