Thanks Michael, I did notice that thread after I sent this mail. Any idea when this patch will be committed?
Regards,
Piet-Hein Peeters
Software Configuration Manager
----------------------------------------------------------------------------
Philips Medical Systems - Healthcare Informatics / PII
Room QV-136, P.O. Box 10.000, NL - 5680 DA Best
Phone +31 40 27 62016
----------------------------------------------------------------------------
To
Raman Gupta
<[EMAIL PROTECTED]>
Michael Willmott cc
<[EMAIL PROTECTED] Piet-Hein
o.co.uk> Peeters/BST/MS/[EMAIL PROTECTED]
[email protected]
07/31/2007 03:47 PM Subject
Re: [Svnmerge] Latest version of
svnmerge.py does not work!
Classification
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
<<inline: graycol.gif>>
<<inline: pic21615.gif>>
<<inline: ecblank.gif>>
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
