hgbook
annotate ja/examples/rename.divergent.merge.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 # See http://www.selenic.com/mercurial/bts/issue455 |
| foozy@708 | 2 $ \textbf{cd ../orig} |
| foozy@708 | 3 $ \textbf{hg pull -u ../anne} |
| foozy@708 | 4 pulling from ../anne |
| foozy@708 | 5 searching for changes |
| foozy@708 | 6 adding changesets |
| foozy@708 | 7 adding manifests |
| foozy@708 | 8 adding file changes |
| foozy@708 | 9 added 1 changesets with 1 changes to 1 files |
| foozy@708 | 10 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| foozy@708 | 11 $ \textbf{hg pull ../bob} |
| foozy@708 | 12 pulling from ../bob |
| foozy@708 | 13 searching for changes |
| foozy@708 | 14 adding changesets |
| foozy@708 | 15 adding manifests |
| foozy@708 | 16 adding file changes |
| foozy@708 | 17 added 1 changesets with 1 changes to 1 files (+1 heads) |
| foozy@708 | 18 (run 'hg heads' to see heads, 'hg merge' to merge) |
| foozy@708 | 19 $ \textbf{hg merge} |
| foozy@708 | 20 warning: detected divergent renames of foo to: |
| foozy@708 | 21 bar |
| foozy@708 | 22 quux |
| foozy@708 | 23 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| foozy@708 | 24 (branch merge, don't forget to commit) |
| foozy@708 | 25 $ \textbf{ls} |
| foozy@708 | 26 bar quux |