RE: issue-2897 branch work is complete

Thanks Lieven.

>Windows build:

>FAIL: merge_tests.py 78: allow non-reflective changes from reflective rev
>FAIL: merge_tests.py 82: reflective merge on reincarnated target

Cause of failure seems to be bit strange.

Expected Properties: {'svn:mergeinfo': '/A/C:5-6,10\n/A/FB1:4-16\n/A/FB2:4-12\n'}
Actual {'svn:mergeinfo': '/A/C:5-6,10\n/A/FB1:4-16\r\n/A/FB2:4-12\n'}

Expected {'svn:mergeinfo': '/A/C:2-3,7,14\n/A/C1:11\n/A/FB:2-15\n'}
Actual {'svn:mergeinfo': '/A/C:2-3,7,14\n/A/C1:11\r\n/A/FB:2-15\n'}

See the in between merge source /A/FB1 and /A/C1 have CR character.

Will investigate.

>FAIL: blame_tests.py 10: test 'svn blame -g'
>FAIL: blame_tests.py 11: don't look for merged files out of range

Have got quite a strange error, does not seem related to 2897 directly. Will investigate.

>Mac build:

>FAIL: log_tests.py 17: test 'svn log -g' on a branching revision
>FAIL: log_tests.py 19: test 'svn log -g' a path added before merge
>FAIL: blame_tests.py 10: test 'svn blame -g'
>FAIL: blame_tests.py 11: don't look for merged files out of range

All these MAC errors seem related to r28843. Will look at it.

With regards
Kamesh Jayachandran
Received on 2008-01-11 21:04:23 CET