[Svnmerge] Latest version of svnmerge.py does not work!

Michael Willmott mwillmott at leadgenpro.co.uk
Tue Jul 31 06:47:24 PDT 2007


Raman Gupta wrote:
> Piet-Hein Peeters wrote:
>> svn: Commit failed (details follow):
>> svn: Inconsistent line ending style
> 
> Most likely this has nothing to do with svnmerge -- check if some data
> you merged from a source branch has inconsistent line endings with the
> target branch.
> 
> If I am mistaken, then please provide more details.

This is a known bug on windows.  See latest patch in the "fix remaining 
test failures on windows" thread for a fix.

-- 
Michael Willmott



More information about the Svnmerge mailing list