hgbook
annotate ja/examples/branch-repo.pull.out @ 709:f9f71850ae1a
Merge with foozy
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Fri Aug 14 12:10:47 2009 -0700 (2009-08-14) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{cd ..} |
| foozy@708 | 2 $ \textbf{hg clone myproject myproject-merge} |
| foozy@708 | 3 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| foozy@708 | 4 $ \textbf{cd myproject-merge} |
| foozy@708 | 5 $ \textbf{hg pull ../myproject-1.0.1} |
| foozy@708 | 6 pulling from ../myproject-1.0.1 |
| foozy@708 | 7 searching for changes |
| foozy@708 | 8 adding changesets |
| foozy@708 | 9 adding manifests |
| foozy@708 | 10 adding file changes |
| foozy@708 | 11 added 1 changesets with 1 changes to 1 files (+1 heads) |
| foozy@708 | 12 (run 'hg heads' to see heads, 'hg merge' to merge) |