Mercurial > hg
view tests/test-merge-local.out @ 11835:14db59e3b248 stable
convert: Test svn sink for a repo with tags.
This test case backs the fix in changeset 7e5f5e5858f9. The subversion
sink used to crash, if the source repo used tags.
| author | Daniel J. Lauk <daniel.lauk@gmail.com> |
|---|---|
| date | Thu, 12 Aug 2010 11:15:33 +0200 |
| parents | 6f1894d6a6b0 |
| children |
line wrap: on
line source
# 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! 3 files updated, 1 files merged, 2 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts during merge. merging zzz2_merge_bad failed! 2 files updated, 1 files merged, 3 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges --- 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 ? zzz2_merge_bad.orig # local merge with conflicts merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts during merge. merging zzz2_merge_bad failed! 3 files updated, 1 files merged, 2 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts during merge. merging zzz2_merge_bad failed! 2 files updated, 1 files merged, 3 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges --- a/zzz1_merge_ok +++ b/zzz1_merge_ok +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 ? zzz2_merge_bad.orig # local merge without conflicts merging zzz1_merge_ok 4 files updated, 1 files merged, 2 files removed, 0 files unresolved --- a/zzz1_merge_ok +++ b/zzz1_merge_ok +new last line M zzz1_merge_ok ? zzz2_merge_bad.orig