Mercurial > hg
view tests/test-merge-local.out @ 9899:be574a37a8ae stable
run-tests: give each child its own tmp dir (issue1911)
Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel
mode = fail), and also fixes the long-standing quirk that parallel mode
created multiple /tmp/hgtests.XXXXXX directories. Now there is only one
/tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
author | Greg Ward <greg@gerg.ca> |
---|---|
date | Wed, 18 Nov 2009 22:23:11 -0500 |
parents | a964ab624385 |
children | 6f1894d6a6b0 |
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 2 files updated, 2 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 M zzz1_merge_ok M zzz2_merge_bad # 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 2 files updated, 2 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 # 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