view tests/test-convert-svn-move.out @ 7785:660c8dd44060

test-merge-tool: Make sure no hgmerge can be found in $PATH

The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.

% convert trunk and branches
initializing destination A-hg repository
scanning source...
sorting...
converting...
9 createtrunk
8 moved1
7 moved1
6 moved2
5 changeb and rm d2
4 changeb and rm d2
3 moved1again
2 moved1again
1 copyfilefrompast
0 copydirfrompast
o  9 copydirfrompast files: d2/d
|
o  8 copyfilefrompast files: d
|
o  7 moved1again files: d1/b d1/c
|
| o  6 moved1again files:
| |
o |  5 changeb and rm d2 files: d1/b d2/d
| |
| o  4 changeb and rm d2 files: b
| |
o |  3 moved2 files: d2/d
| |
o |  2 moved1 files: d1/b d1/c
| |
| o  1 moved1 files: b c
|
o  0 createtrunk files:

default                        9:
d1                             6: