annotate en/examples/results/branching.merge.out @ 564:0d5935744f87
Switch from LaTeX to XML for examples.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Mon Mar 09 21:39:23 2009 -0700 (2009-03-09) |
| parents |
44d1363234d2 |
| children |
4432ad34b8e5 |
| rev |
line source |
|
bos@564
|
1 <screen><prompt>$</prompt> <userinput>cd ../main</userinput>
|
|
bos@564
|
2 <prompt>$</prompt> <userinput>hg pull ../stable</userinput>
|
|
bos@179
|
3 pulling from ../stable
|
|
bos@179
|
4 searching for changes
|
|
bos@179
|
5 adding changesets
|
|
bos@179
|
6 adding manifests
|
|
bos@179
|
7 adding file changes
|
|
bos@179
|
8 added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
bos@179
|
9 (run 'hg heads' to see heads, 'hg merge' to merge)
|
|
bos@564
|
10 <prompt>$</prompt> <userinput>hg merge</userinput>
|
|
bos@179
|
11 merging myfile
|
|
bos@179
|
12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
bos@179
|
13 (branch merge, don't forget to commit)
|
|
bos@564
|
14 <prompt>$</prompt> <userinput>hg commit -m 'Bring in bugfix from stable branch'</userinput>
|
|
bos@564
|
15 <prompt>$</prompt> <userinput>cat myfile</userinput>
|
|
bos@179
|
16 This is a fix to a boring feature.
|
|
bos@179
|
17 This is exciting and new!
|
|
bos@564
|
18 </screen>
|
