test-merge-local.out
69 lines
| 1.7 KiB
| text/plain
|
TextLexer
/ tests / test-merge-local.out
Thomas Arendsen Hein
|
r3869 | # revision 0 | ||
| adding copy | ||||
| adding move | ||||
| adding remove | ||||
| adding unchanged | ||||
| adding zzz1_merge_ok | ||||
| adding zzz2_merge_bad | ||||
| # revision 1 | ||||
| # local changes to revision 0 | ||||
| 4 files updated, 0 files merged, 3 files removed, 0 files unresolved | ||||
| --- a/zzz1_merge_ok | ||||
| +++ b/zzz1_merge_ok | ||||
| +new last line | ||||
| --- a/zzz2_merge_bad | ||||
| +++ b/zzz2_merge_bad | ||||
| +another last line | ||||
| M zzz1_merge_ok | ||||
| M zzz2_merge_bad | ||||
| # local merge with bad merge tool | ||||
| merging zzz1_merge_ok | ||||
| merging zzz2_merge_bad | ||||
| merging zzz2_merge_bad failed! | ||||
Matt Mackall
|
r6004 | 3 files updated, 1 files merged, 2 files removed, 1 files unresolved | ||
|
Thomas Arendsen Hein
|
r3869 | There are unresolved merges with locally modified files. | ||
|
Matt Mackall
|
r6004 | You can finish the partial merge using: | ||
|
Thomas Arendsen Hein
|
r3869 | hg update 0 | ||
| hg update 1 | ||||
| 2 files updated, 0 files merged, 3 files removed, 0 files unresolved | ||||
| --- a/zzz1_merge_ok | ||||
| +++ b/zzz1_merge_ok | ||||
|
Matt Mackall
|
r6004 | +new first line | ||
|
Thomas Arendsen Hein
|
r3869 | +new last line | ||
| --- a/zzz2_merge_bad | ||||
| +++ b/zzz2_merge_bad | ||||
| +another last line | ||||
| M zzz1_merge_ok | ||||
| M zzz2_merge_bad | ||||
|
Matt Mackall
|
r6004 | ? zzz2_merge_bad.orig | ||
|
Thomas Arendsen Hein
|
r3869 | # local merge with conflicts | ||
| merging zzz1_merge_ok | ||||
| merging zzz2_merge_bad | ||||
|
Matt Mackall
|
r6004 | warning: conflicts during merge. | ||
|
Thomas Arendsen Hein
|
r3869 | merging zzz2_merge_bad failed! | ||
|
Matt Mackall
|
r4416 | 3 files updated, 1 files merged, 2 files removed, 1 files unresolved | ||
|
Thomas Arendsen Hein
|
r3869 | There are unresolved merges with locally modified files. | ||
| You can finish the partial merge using: | ||||
| hg update 0 | ||||
| hg update 1 | ||||
| 2 files updated, 0 files merged, 3 files removed, 0 files unresolved | ||||
| --- a/zzz1_merge_ok | ||||
| +++ b/zzz1_merge_ok | ||||
| +new first line | ||||
| +new last line | ||||
| --- a/zzz2_merge_bad | ||||
| +++ b/zzz2_merge_bad | ||||
| +another last line | ||||
| +======= | ||||
| +new last line | ||||
| M zzz1_merge_ok | ||||
| M zzz2_merge_bad | ||||
|
Matt Mackall
|
r6004 | ? zzz2_merge_bad.orig | ||
|
Thomas Arendsen Hein
|
r3869 | # local merge without conflicts | ||
| merging zzz1_merge_ok | ||||
|
Matt Mackall
|
r4416 | 4 files updated, 1 files merged, 2 files removed, 0 files unresolved | ||
|
Thomas Arendsen Hein
|
r3869 | --- a/zzz1_merge_ok | ||
| +++ b/zzz1_merge_ok | ||||
| +new last line | ||||
| M zzz1_merge_ok | ||||
| ? zzz2_merge_bad.orig | ||||