hgbook
annotate ja/examples/branching.merge.out @ 993:71dbda516572
French translation : merge with Jean Marie Clement's work on ch04-concepts
| author | Frédéric Bouquet <youshe.jaalon@gmail.com> |
|---|---|
| date | Fri Sep 11 14:35:36 2009 +0200 (2009-09-11) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{cd ../main} |
| foozy@708 | 2 $ \textbf{hg pull ../stable} |
| foozy@708 | 3 pulling from ../stable |
| foozy@708 | 4 searching for changes |
| foozy@708 | 5 adding changesets |
| foozy@708 | 6 adding manifests |
| foozy@708 | 7 adding file changes |
| foozy@708 | 8 added 1 changesets with 1 changes to 1 files (+1 heads) |
| foozy@708 | 9 (run 'hg heads' to see heads, 'hg merge' to merge) |
| foozy@708 | 10 $ \textbf{hg merge} |
| foozy@708 | 11 merging myfile |
| foozy@708 | 12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| foozy@708 | 13 (branch merge, don't forget to commit) |
| foozy@708 | 14 $ \textbf{hg commit -m 'Bring in bugfix from stable branch'} |
| foozy@708 | 15 $ \textbf{cat myfile} |
| foozy@708 | 16 This is a fix to a boring feature. |
| foozy@708 | 17 This is exciting and new! |