Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge-local.out @ 3869:ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
b2ae81a7df29 already implemented this for branch merges.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 11 Dec 2006 18:09:52 +0100 |
| parents | |
| children | 4787e2b0dd03 |
comparison
equal
deleted
inserted
replaced
| 3868:6033d9f28052 | 3869:ad6f34c83c3d |
|---|---|
| 1 # revision 0 | |
| 2 adding copy | |
| 3 adding move | |
| 4 adding remove | |
| 5 adding unchanged | |
| 6 adding zzz1_merge_ok | |
| 7 adding zzz2_merge_bad | |
| 8 # revision 1 | |
| 9 # local changes to revision 0 | |
| 10 4 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
| 11 --- a/zzz1_merge_ok | |
| 12 +++ b/zzz1_merge_ok | |
| 13 +new last line | |
| 14 --- a/zzz2_merge_bad | |
| 15 +++ b/zzz2_merge_bad | |
| 16 +another last line | |
| 17 M zzz1_merge_ok | |
| 18 M zzz2_merge_bad | |
| 19 # local merge with bad merge tool | |
| 20 merging zzz1_merge_ok | |
| 21 merging zzz1_merge_ok failed! | |
| 22 merging zzz2_merge_bad | |
| 23 merging zzz2_merge_bad failed! | |
| 24 3 files updated, 0 files merged, 2 files removed, 2 files unresolved | |
| 25 There are unresolved merges with locally modified files. | |
| 26 You can redo the full merge using: | |
| 27 hg update 0 | |
| 28 hg update 1 | |
| 29 2 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
| 30 --- a/zzz1_merge_ok | |
| 31 +++ b/zzz1_merge_ok | |
| 32 +new last line | |
| 33 --- a/zzz2_merge_bad | |
| 34 +++ b/zzz2_merge_bad | |
| 35 +another last line | |
| 36 M zzz1_merge_ok | |
| 37 M zzz2_merge_bad | |
| 38 # local merge with conflicts | |
| 39 merge: warning: conflicts during merge | |
| 40 merging zzz1_merge_ok | |
| 41 merging zzz2_merge_bad | |
| 42 merging zzz2_merge_bad failed! | |
| 43 3 files updated, 1 files merged, 2 files removed, 1 files unresolved | |
| 44 There are unresolved merges with locally modified files. | |
| 45 You can finish the partial merge using: | |
| 46 hg update 0 | |
| 47 hg update 1 | |
| 48 2 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
| 49 --- a/zzz1_merge_ok | |
| 50 +++ b/zzz1_merge_ok | |
| 51 +new first line | |
| 52 +new last line | |
| 53 --- a/zzz2_merge_bad | |
| 54 +++ b/zzz2_merge_bad | |
| 55 +another last line | |
| 56 +======= | |
| 57 +new last line | |
| 58 M zzz1_merge_ok | |
| 59 M zzz2_merge_bad | |
| 60 # local merge without conflicts | |
| 61 merging zzz1_merge_ok | |
| 62 4 files updated, 1 files merged, 2 files removed, 0 files unresolved | |
| 63 --- a/zzz1_merge_ok | |
| 64 +++ b/zzz1_merge_ok | |
| 65 +new last line | |
| 66 M zzz1_merge_ok | |
| 67 ? zzz2_merge_bad.orig |