annotate en/examples/branching.merge.out @ 495:dfa2890d9b30
translated most of section 13.8
| author |
Javier Rojas <jerojasro@devnull.li> |
| date |
Wed Jan 07 23:38:40 2009 -0500 (2009-01-07) |
| parents |
|
| children |
|
| rev |
line source |
|
bos@179
|
1 $ \textbf{cd ../main}
|
|
bos@179
|
2 $ \textbf{hg pull ../stable}
|
|
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@179
|
10 $ \textbf{hg merge}
|
|
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@179
|
14 $ \textbf{hg commit -m 'Bring in bugfix from stable branch'}
|
|
bos@179
|
15 $ \textbf{cat myfile}
|
|
bos@179
|
16 This is a fix to a boring feature.
|
|
bos@179
|
17 This is exciting and new!
|
