Mercurial > hgbook

view en/examples/results/rename.divergent.merge.out @ 688:4bb10cfa3812

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make actual use of the preface.
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 26 Mar 2009 19:58:09 -0700
parents 0d5935744f87
children 4432ad34b8e5
line wrap: on
line source

<screen># See http://www.selenic.com/mercurial/bts/issue455
<prompt>$</prompt> <userinput>cd ../orig</userinput>
<prompt>$</prompt> <userinput>hg pull -u ../anne</userinput>
pulling from ../anne
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
<prompt>$</prompt> <userinput>hg pull ../bob</userinput>
pulling from ../bob
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
<prompt>$</prompt> <userinput>hg merge</userinput>
warning: detected divergent renames of foo to:
 bar
 quux
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
<prompt>$</prompt> <userinput>ls</userinput>
bar  quux
</screen>