hgbook
view 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 |
line source
1 <!-- BEGIN rename.divergent.merge -->
2 <screen># See http://www.selenic.com/mercurial/bts/issue455
3 <prompt>$</prompt> <userinput>cd ../orig</userinput>
4 <prompt>$</prompt> <userinput>hg pull -u ../anne</userinput>
5 pulling from ../anne
6 searching for changes
7 adding changesets
8 adding manifests
9 adding file changes
10 added 1 changesets with 1 changes to 1 files
11 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
12 <prompt>$</prompt> <userinput>hg pull ../bob</userinput>
13 pulling from ../bob
14 searching for changes
15 adding changesets
16 adding manifests
17 adding file changes
18 added 1 changesets with 1 changes to 1 files (+1 heads)
19 (run 'hg heads' to see heads, 'hg merge' to merge)
20 <prompt>$</prompt> <userinput>hg merge</userinput>
21 warning: detected divergent renames of foo to:
22 bar
23 quux
24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
25 (branch merge, don't forget to commit)
26 <prompt>$</prompt> <userinput>ls</userinput>
27 bar quux
28 </screen>
29 <!-- END rename.divergent.merge -->