hgbook

annotate en/examples/backout.non-tip.backout.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 006bbad1f190
children
rev   line source
bos@144 1 $ \textbf{echo third change >> myfile}
bos@144 2 $ \textbf{hg commit -m 'third change'}
bos@144 3 $ \textbf{hg backout --merge -m 'back out second change' 1}
bos@144 4 reverting myfile
hg@296 5 created new head
bos@144 6 changeset backs out changeset
bos@144 7 merging with changeset
bos@144 8 merging myfile
bos@144 9 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
bos@144 10 (branch merge, don't forget to commit)