annotate en/examples/results/rename.divergent.merge.out @ 611:4432ad34b8e5
Check in example outputs with begin/end markers.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Tue Mar 31 12:19:01 2009 -0700 (2009-03-31) |
| parents |
0d5935744f87 |
| children |
|
| rev |
line source |
|
bos@611
|
1 <!-- BEGIN rename.divergent.merge -->
|
|
bos@564
|
2 <screen># See http://www.selenic.com/mercurial/bts/issue455
|
|
bos@564
|
3 <prompt>$</prompt> <userinput>cd ../orig</userinput>
|
|
bos@564
|
4 <prompt>$</prompt> <userinput>hg pull -u ../anne</userinput>
|
|
bos@156
|
5 pulling from ../anne
|
|
bos@156
|
6 searching for changes
|
|
bos@156
|
7 adding changesets
|
|
bos@156
|
8 adding manifests
|
|
bos@156
|
9 adding file changes
|
|
bos@156
|
10 added 1 changesets with 1 changes to 1 files
|
|
bos@228
|
11 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
bos@564
|
12 <prompt>$</prompt> <userinput>hg pull ../bob</userinput>
|
|
bos@156
|
13 pulling from ../bob
|
|
bos@156
|
14 searching for changes
|
|
bos@156
|
15 adding changesets
|
|
bos@156
|
16 adding manifests
|
|
bos@156
|
17 adding file changes
|
|
bos@156
|
18 added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
bos@156
|
19 (run 'hg heads' to see heads, 'hg merge' to merge)
|
|
bos@564
|
20 <prompt>$</prompt> <userinput>hg merge</userinput>
|
|
bos@273
|
21 warning: detected divergent renames of foo to:
|
|
bos@273
|
22 bar
|
|
bos@273
|
23 quux
|
|
bos@156
|
24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
bos@156
|
25 (branch merge, don't forget to commit)
|
|
bos@564
|
26 <prompt>$</prompt> <userinput>ls</userinput>
|
|
bos@156
|
27 bar quux
|
|
bos@564
|
28 </screen>
|
|
bos@611
|
29 <!-- END rename.divergent.merge -->
|
