Mercurial > hgbook

view en/examples/rename.divergent.merge.out @ 484:0abd3d78172e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
finished translation of a figure translated a few paragraphs of tour-merge
author Javier Rojas <jerojasro@devnull.li>
date Sun, 02 Nov 2008 13:54:42 -0500
parents 00f69e8825c5
children
line wrap: on
line source

# See http://www.selenic.com/mercurial/bts/issue455
$ \textbf{cd ../orig}
$ \textbf{hg pull -u ../anne}
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
$ \textbf{hg pull ../bob}
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)
$ \textbf{hg merge}
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)
$ \textbf{ls}
bar  quux