Mercurial > hgbook

annotate en/examples/results/branching.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>cd ../main</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
2 <prompt>$</prompt> <userinput>hg pull ../stable</userinput>
179
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 pulling from ../stable
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 searching for changes
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 adding changesets
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 adding manifests
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 adding file changes
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 added 1 changesets with 1 changes to 1 files (+1 heads)
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 (run 'hg heads' to see heads, 'hg merge' to merge)
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
10 <prompt>$</prompt> <userinput>hg merge</userinput>
179
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 merging myfile
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 (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
14 <prompt>$</prompt> <userinput>hg commit -m 'Bring in bugfix from stable branch'</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
15 <prompt>$</prompt> <userinput>cat myfile</userinput>
179
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16 This is a fix to a boring feature.
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
17 This is exciting and new!
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
18 </screen>