Mercurial > hgbook

annotate en/examples/results/issue29.go.out @ 688:4bb10cfa3812

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make actual use of the preface.
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 26 Mar 2009 19:58:09 -0700
parents 0d5935744f87
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>hg init issue29</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
2 <prompt>$</prompt> <userinput>cd issue29</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
3 <prompt>$</prompt> <userinput>echo a &gt; a</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
4 <prompt>$</prompt> <userinput>hg ci -Ama</userinput>
156
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 adding a
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
6 <prompt>$</prompt> <userinput>echo b &gt; b</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
7 <prompt>$</prompt> <userinput>hg ci -Amb</userinput>
156
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 adding b
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
9 <prompt>$</prompt> <userinput>hg up 0</userinput>
156
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
11 <prompt>$</prompt> <userinput>mkdir b</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
12 <prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
13 <prompt>$</prompt> <userinput>hg ci -Amc</userinput>
156
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14 adding b/b
394
43bfadf9b760 Fixed sample output for 'issue29' test.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 156
diff changeset
15 created new head
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
16 <prompt>$</prompt> <userinput>hg merge</userinput>
156
91a936be78b8 Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
17
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
18 </screen>