Re: Merge handles svn:eol-style wrongly

On Fri, 2008-09-05 at 12:08 +0100, Julian Foad wrote:
> Thanks, David. This makes my test pass. Committed in 32913.

But my test (merge_tests.py 107) is now failing on Windows.

Can anyone help me figure out why "propset svn:eol-style native" fails
on Windows? The file content is supposed to have CR-LF line separators,
as I think this is what Python's "os.linesep" is supposed to give.

This is the code sequence (and it is before the part of the test where
the bug fixed in r32913 manifested itself):

[[[
  content1 = 'Line1\nLine2\r\n'
  content2 = 'Line1' + os.linesep + 'Line2' + os.linesep

  # In the source branch, create initial state and two successive
changes
  svntest.main.file_write('A/mu', content1)
  rev1 = svn_commit('A/mu')
  svntest.main.file_write('A/mu', content2)
  rev2 = svn_commit('A/mu')
  svn_propset('svn:eol-style', 'native', 'A/mu')
  rev3 = svn_commit('A/mu')
]]]

and the output is:

[[[
CMD: svn.exe commit -m "" "A\mu" --config-dir "M:\svn-auto-test\fsfs\subversion\tests\cmdline\svn-test-work\local_tmp\config" --password rayjandom --no-auth-cache --username jrandom <TIME = 0.703000>

Sending A\mu

Transmitting file data .

Committed revision 7.

CMD: svn.exe commit -m "" "A\mu" --config-dir "M:\svn-auto-test\fsfs\subversion\tests\cmdline\svn-test-work\local_tmp\config" --password rayjandom --no-auth-cache --username jrandom <TIME = 0.875000>

Sending A\mu

Transmitting file data .

Committed revision 8.

CMD: svn.exe propset svn:eol-style native "A\mu" --config-dir "M:\svn-auto-test\fsfs\subversion\tests\cmdline\svn-test-work\local_tmp\config" --password rayjandom --no-auth-cache --username jrandom <TIME = 0.579000>

svn: File 'A\mu' has inconsistent newlines

svn: Inconsistent line ending style
]]]

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-05 14:37:49 CEST