hgbook

annotate en/examples/rename.divergent.merge.out @ 336:7e52f0cc4516

find changesets by author, revision, files, or words in the commit message
changed es/hgext.tex
changed es/hook.tex
changed es/kdiff3.png
changed es/license.tex
changed es/mq-collab.tex
changed es/mq-ref.tex
changed es/mq.tex
changed es/note.png
changed es/tour-merge.tex
changed es/undo-manual-merge.dot
changed es/undo-non-tip.dot

files needed to compile the pdf version of the book.
author jerojasro@localhost
date Sat Oct 18 15:44:41 2008 -0500 (2008-10-18)
parents 50223e198614
children
rev   line source
bos@156 1 # See http://www.selenic.com/mercurial/bts/issue455
bos@156 2 $ \textbf{cd ../orig}
bos@156 3 $ \textbf{hg pull -u ../anne}
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@156 11 $ \textbf{hg pull ../bob}
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@156 19 $ \textbf{hg merge}
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@156 25 $ \textbf{ls}
bos@156 26 bar quux