Mercurial > hgbook

annotate en/examples/results/branch-named.merge.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>hg branch</userinput>
206
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 bar
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
3 <prompt>$</prompt> <userinput>hg merge foo</userinput>
206
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 (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
6 <prompt>$</prompt> <userinput>hg commit -m 'Merge'</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
7 <prompt>$</prompt> <userinput>hg tip</userinput>
206
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 changeset:
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 branch: bar
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 tag: tip
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 parent:
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 parent:
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
13 user: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
206
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15 summary: Merge
6519f3b983b4 More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
17 </screen>