hgbook

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