Mercurial > hg
comparison tests/test-merge9.out @ 6518:92ccccb55ba3
resolve: new command
- add basic resolve command functionality
- point failed update and merge at resolve
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 11 Apr 2008 12:52:56 -0500 |
| parents | 368a4ec603cc |
| children | 5a14a8f3b909 |
comparison
equal
deleted
inserted
replaced
| 6517:fcfb6a0a0a84 | 6518:92ccccb55ba3 |
|---|---|
| 5 created new head | 5 created new head |
| 6 merging bar | 6 merging bar |
| 7 merging bar failed! | 7 merging bar failed! |
| 8 merging foo and baz to baz | 8 merging foo and baz to baz |
| 9 1 files updated, 1 files merged, 0 files removed, 1 files unresolved | 9 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
| 10 There are unresolved merges, you can redo the full merge using: | 10 use 'hg resolve' to retry unresolved file merges |
| 11 hg update -C 2 | 11 U bar |
| 12 hg merge 1 | 12 R baz |
| 13 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | 13 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 14 merging bar | 14 merging bar |
| 15 merging bar failed! | 15 merging bar failed! |
| 16 merging baz and foo to baz | 16 merging baz and foo to baz |
| 17 1 files updated, 1 files merged, 0 files removed, 1 files unresolved | 17 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
| 18 There are unresolved merges, you can redo the full merge using: | 18 use 'hg resolve' to retry unresolved file merges |
| 19 hg update -C 1 | 19 % show unresolved |
| 20 hg merge 2 | 20 U bar |
| 21 R baz | |
| 22 % unmark baz | |
| 23 % show | |
| 24 U bar | |
| 25 U baz | |
| 26 % re-resolve baz | |
| 27 merging baz and foo to baz | |
| 28 % after | |
| 29 U bar | |
| 30 R baz | |
| 31 % resolve all | |
| 32 merging bar | |
| 33 warning: conflicts during merge. | |
| 34 merging bar failed! | |
| 35 % after | |
| 36 U bar | |
| 37 R baz |