annotate en/examples/results/branch-repo.pull.out @ 593:8dfdbe1cf982
Update Apache2 configuration.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Thu Mar 26 22:00:32 2009 -0700 (2009-03-26) |
| parents |
44d1363234d2 |
| children |
4432ad34b8e5 |
| rev |
line source |
|
bos@564
|
1 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
|
|
bos@564
|
2 <prompt>$</prompt> <userinput>hg clone myproject myproject-merge</userinput>
|
|
hg@298
|
3 updating working directory
|
|
bos@199
|
4 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
bos@564
|
5 <prompt>$</prompt> <userinput>cd myproject-merge</userinput>
|
|
bos@564
|
6 <prompt>$</prompt> <userinput>hg pull ../myproject-1.0.1</userinput>
|
|
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)
|
|
bos@564
|
14 </screen>
|
