Mercurial > hgbook
annotate en/examples/results/branching.merge.out @ 709:4432ad34b8e5
Check in example outputs with begin/end markers.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 31 Mar 2009 12:19:01 -0700 |
parents | 0d5935744f87 |
children |
rev | line source |
---|---|
709
4432ad34b8e5
Check in example outputs with begin/end markers.
Bryan O'Sullivan <bos@serpentine.com>
parents:
663
diff
changeset
|
1 <!-- BEGIN branching.merge --> |
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
2 <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
|
3 <prompt>$</prompt> <userinput>hg pull ../stable</userinput> |
179
5fc4a45c069f
Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 pulling from ../stable |
5fc4a45c069f
Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 searching for changes |
5fc4a45c069f
Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 adding changesets |
5fc4a45c069f
Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 adding manifests |
5fc4a45c069f
Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 adding file changes |
5fc4a45c069f
Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 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
|
10 (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
|
11 <prompt>$</prompt> <userinput>hg merge</userinput> |
179
5fc4a45c069f
Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 merging myfile |
5fc4a45c069f
Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 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
|
14 (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
|
15 <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
|
16 <prompt>$</prompt> <userinput>cat myfile</userinput> |
179
5fc4a45c069f
Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 This is a fix to a boring feature. |
5fc4a45c069f
Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
18 This is exciting and new! |
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
19 </screen> |
709
4432ad34b8e5
Check in example outputs with begin/end markers.
Bryan O'Sullivan <bos@serpentine.com>
parents:
663
diff
changeset
|
20 <!-- END branching.merge --> |