hgbook
annotate ja/examples/daily.copy.merge.out @ 719:eca3a16c0114
Merge with dongsheng
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Fri Aug 14 12:12:19 2009 -0700 (2009-08-14) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{hg pull ../my-copy} |
| foozy@708 | 2 pulling from ../my-copy |
| foozy@708 | 3 searching for changes |
| foozy@708 | 4 adding changesets |
| foozy@708 | 5 adding manifests |
| foozy@708 | 6 adding file changes |
| foozy@708 | 7 added 1 changesets with 1 changes to 1 files (+1 heads) |
| foozy@708 | 8 (run 'hg heads' to see heads, 'hg merge' to merge) |
| foozy@708 | 9 $ \textbf{hg merge} |
| foozy@708 | 10 merging file and new-file |
| foozy@708 | 11 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| foozy@708 | 12 (branch merge, don't forget to commit) |
| foozy@708 | 13 $ \textbf{cat new-file} |
| foozy@708 | 14 line |
| foozy@708 | 15 new contents |