Mercurial > hgbook

annotate en/examples/results/backout.non-tip.backout.out @ 663:0d5935744f87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch from LaTeX to XML for examples.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 21:39:23 -0700
parents 44d1363234d2
children 4432ad34b8e5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
1 <screen><prompt>$</prompt> <userinput>echo third change &gt;&gt; myfile</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
2 <prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
3 <prompt>$</prompt> <userinput>hg backout --merge -m 'back out second change' 1</userinput>
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 reverting myfile
395
e0b56f008b09 Fix sample output for 'backout' test.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 144
diff changeset
5 created new head
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 changeset backs out changeset
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 merging with changeset
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 merging myfile
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 (branch merge, don't forget to commit)
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
11 </screen>