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