[svk-devel] t/04merge failure on Win32 after r1875

[Kevin Light]

It appears that an end of line issue has come up on Win32 at r1875.  The first indication of trouble is t\04merge as it fails because of conflicts:

t\04merge....1..16
ok 1 - merge - help
ok 2 - merge - too many args
not ok 3 - merge via update

#   Failed test 'merge via update'
#   in t\04merge.t at line 46.
#     Structures begin differing at:
#          $got->[1] = 'CU  t\checkout\merge\A\foo'
#     $expected->[1] = 'GU  t\checkout\merge\A\foo'

#   Failed test 'merge via update file content'
#   in t\04merge.t at line 53.
#          got: '>>>> YOUR VERSION A/foo 115646911933206
# some local mods
# foobar
# ==== ORIGINAL VERSION A/foo 115646911933206
# foobar
# ==== THEIR VERSION A/foo 115646911933206
# foobar
# 
# some more foobar
# zz
# <<<< 115646911933206
# '
#     expected: 'some local mods
# foobar
# 
# some more foobar
# zz
# '
not ok 4 - merge via update file content

I don't have a solution yet, just posting my findings so far.