[Svnmerge] [PATCH] fix remaining test failures on Windows

[Piet-Hein Peeters]

Hi Dustin,

I've tested your patch, but I'm sorry to say it didn't work:

----------Error Output----------
svn: Commit failed (details follow):
svn: Inconsistent line ending style

So we stick to revision 25684 of svnmerge.py for the time being, because
that one generates a correct log message.

I've also run the patched svnmerge_test.py script you provided.

Here is the output:
(See attached file: svnmerge_test_output.txt)


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 
                                       svnmerge at orcaware.com               
                                                                        cc 
     "Dustin J. Mitchell"                                                  
     <dustin at zmanda.com>                                           Subject 
                                       Re: [Svnmerge] [PATCH] fix          
     Sent by:                          remaining test failures on Windows  
     svnmerge-bounces+pie                                   Classification 
     t-hein.peeters=phili                                                  
     ps.com at orcaware.com                                                   
                                                                           
     08/01/2007 10:31 PM                                                   
                                                                           
                                                                           
                                                                           




On Tue, Jul 31, 2007 at 06:30:22PM +0200, Hernan Martinez Foffani wrote:
> > I don't think that collapsing a sequence of \r or \n to a single \n is
> > the right thing to do: it would destroy paragraph formatting.
>
> I agree.
>
> >
> > Is a simple "message = message.replace("\r\n", "\n")" enough? If not,
> > why?
>
> With the .replace tests pass ok in Windows.

But it won't work for Mac newlines.  I just attached an updated version
of my previous patch, correcting a stupid mistake on my part, to the
bug.

If only I had a windows box to test this on :(

http://subversion.tigris.org/nonav/issues/showattachment.cgi/691/fixWindowsLineTermFailures.patch


Dustin

--
        Dustin J. Mitchell
        Storage Software Engineer, Zmanda, Inc.
        http://www.zmanda.com/
_______________________________________________
Svnmerge mailing list
Svnmerge at orcaware.com
http://www.orcaware.com/mailman/listinfo/svnmerge
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20070802/c459ecf0/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: graycol.gif
Type: image/gif
Size: 105 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070802/c459ecf0/attachment-0006.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pic12093.gif
Type: image/gif
Size: 1255 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070802/c459ecf0/attachment-0007.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ecblank.gif
Type: image/gif
Size: 45 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070802/c459ecf0/attachment-0008.gif>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: svnmerge_test_output.txt
URL: </pipermail/svnmerge/attachments/20070802/c459ecf0/attachment-0002.txt>