hgbook

annotate es/examples/issue29 @ 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
children
rev   line source
igor@333 1 #!/bin/bash
igor@333 2
igor@333 3 #$ name: go
igor@333 4
igor@333 5 hg init issue29
igor@333 6 cd issue29
igor@333 7 echo a > a
igor@333 8 hg ci -Ama
igor@333 9 echo b > b
igor@333 10 hg ci -Amb
igor@333 11 hg up 0
igor@333 12 mkdir b
igor@333 13 echo b > b/b
igor@333 14 hg ci -Amc
igor@333 15
igor@333 16 #$ ignore: abort: Is a directory: .*
igor@333 17 hg merge
igor@333 18
igor@333 19 #$ name:
igor@333 20 # This error is expected from the failed merge.
igor@333 21
igor@333 22 exit 0