annotate en/examples/results/tour-merge-conflict.pull.out @ 614:c8680784cdbb
Make builds more reliable.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Tue Mar 31 15:35:44 2009 -0700 (2009-03-31) |
| parents |
0d5935744f87 |
| children |
|
| rev |
line source |
|
bos@611
|
1 <!-- BEGIN tour-merge-conflict.pull -->
|
|
bos@564
|
2 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
|
|
bos@564
|
3 <prompt>$</prompt> <userinput>hg clone scam-cousin scam-merge</userinput>
|
|
hg@302
|
4 updating working directory
|
|
bos@144
|
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
bos@564
|
6 <prompt>$</prompt> <userinput>cd scam-merge</userinput>
|
|
bos@564
|
7 <prompt>$</prompt> <userinput>hg pull -u ../scam-son</userinput>
|
|
bos@144
|
8 pulling from ../scam-son
|
|
bos@144
|
9 searching for changes
|
|
bos@144
|
10 adding changesets
|
|
bos@144
|
11 adding manifests
|
|
bos@144
|
12 adding file changes
|
|
bos@144
|
13 added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
bos@144
|
14 not updating, since new heads added
|
|
bos@144
|
15 (run 'hg heads' to see heads, 'hg merge' to merge)
|
|
bos@564
|
16 </screen>
|
|
bos@611
|
17 <!-- END tour-merge-conflict.pull -->
|
