hgbook
view en/examples/results/rename.divergent.merge.out @ 564:0d5935744f87
Switch from LaTeX to XML for examples.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Mar 09 21:39:23 2009 -0700 (2009-03-09) |
| parents | 44d1363234d2 |
| children | 4432ad34b8e5 |
line source
1 <screen># See http://www.selenic.com/mercurial/bts/issue455
2 <prompt>$</prompt> <userinput>cd ../orig</userinput>
3 <prompt>$</prompt> <userinput>hg pull -u ../anne</userinput>
4 pulling from ../anne
5 searching for changes
6 adding changesets
7 adding manifests
8 adding file changes
9 added 1 changesets with 1 changes to 1 files
10 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
11 <prompt>$</prompt> <userinput>hg pull ../bob</userinput>
12 pulling from ../bob
13 searching for changes
14 adding changesets
15 adding manifests
16 adding file changes
17 added 1 changesets with 1 changes to 1 files (+1 heads)
18 (run 'hg heads' to see heads, 'hg merge' to merge)
19 <prompt>$</prompt> <userinput>hg merge</userinput>
20 warning: detected divergent renames of foo to:
21 bar
22 quux
23 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
24 (branch merge, don't forget to commit)
25 <prompt>$</prompt> <userinput>ls</userinput>
26 bar quux
27 </screen>