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
[email protected]
cc
"Dustin J. Mitchell"
<[EMAIL PROTECTED]> Subject
Re: [Svnmerge] [PATCH] fix
Sent by: remaining test failures on Windows
svnmerge-bounces+pie Classification
t-hein.peeters=phili
[EMAIL PROTECTED]
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
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge
<<inline: graycol.gif>>
<<inline: pic12093.gif>>
<<inline: ecblank.gif>>
F..................FFFF......FF.F.......F....E..
======================================================================
ERROR: test_basic (__main__.TestCase_launch)
----------------------------------------------------------------------
Traceback (most recent call last):
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 68, in test_basic
out = svnmerge.launch(self.cmd)
File "C:\dev\tools\svnmerge\svnmerge.py", line 250, in launch
raise LaunchError(1, cmd, stdout + " " + stderr + ": " + str(inst))
LaunchError: (1, 'dir', ' : [Error 2] The system cannot find the file
specified')
======================================================================
FAIL: Make sure you can intermix command name, arguments and
----------------------------------------------------------------------
Traceback (most recent call last):
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 295, in testOptionOrder
match=r"no integration info") # accepted
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 195, in svnmerge
return self.svnmerge2(cmds.split(), *args, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 225, in svnmerge2
"pattern %r not found in output:\n%s" % (match, out.getvalue()))
AssertionError: pattern 'no integration info' not found in output:
svnmerge: multiple sources found. Explicit source argument (-S/--source)
required.
The merge sources available are:
/branches/pmw
/branches/dicomviewer24
======================================================================
FAIL: Check that reflected revisions are recognized properly for bidirectional
merges.
----------------------------------------------------------------------
Traceback (most recent call last):
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 861, in
testBidirectionalMerges
match=r"Committed revision 17")
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 469, in launch
return TestCase_SvnMerge.launch(self, cmd, *args, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 256, in launch
return self._parseoutput(ret, out, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 240, in _parseoutput
"svnmerge failed, with this output:\n%s" % out)
AssertionError: svnmerge failed, with this output:
svn: Commit failed (details follow):
svn: Inconsistent line ending style
======================================================================
FAIL: Check that merges from a second branch are not considered reflected for
other branches.
----------------------------------------------------------------------
Traceback (most recent call last):
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 951, in
testBidirectionalMergesMultiBranch
match=r"Committed revision 20")
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 469, in launch
return TestCase_SvnMerge.launch(self, cmd, *args, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 256, in launch
return self._parseoutput(ret, out, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 240, in _parseoutput
"svnmerge failed, with this output:\n%s" % out)
AssertionError: svnmerge failed, with this output:
svn: Commit failed (details follow):
svn: Inconsistent line ending style
======================================================================
FAIL: Init svnmerge, block, modify head, merge, rollback.
----------------------------------------------------------------------
Traceback (most recent call last):
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 1123, in
testBlockMergeAndRollback
match = r"Committed revision 17")
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 469, in launch
return TestCase_SvnMerge.launch(self, cmd, *args, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 256, in launch
return self._parseoutput(ret, out, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 240, in _parseoutput
"svnmerge failed, with this output:\n%s" % out)
AssertionError: svnmerge failed, with this output:
svn: Commit failed (details follow):
svn: Inconsistent line ending style
======================================================================
FAIL: testBlocked (__main__.TestCase_TestRepo)
----------------------------------------------------------------------
Traceback (most recent call last):
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 531, in testBlocked
match=r"Committed revision")
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 469, in launch
return TestCase_SvnMerge.launch(self, cmd, *args, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 256, in launch
return self._parseoutput(ret, out, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 240, in _parseoutput
"svnmerge failed, with this output:\n%s" % out)
AssertionError: svnmerge failed, with this output:
svn: Commit failed (details follow):
svn: Inconsistent line ending style
======================================================================
FAIL: Init svnmerge, modify source head, merge, rollback.
----------------------------------------------------------------------
Traceback (most recent call last):
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 1093, in
testMergeAndRollback
match = r"Committed revision 16")
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 469, in launch
return TestCase_SvnMerge.launch(self, cmd, *args, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 256, in launch
return self._parseoutput(ret, out, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 240, in _parseoutput
"svnmerge failed, with this output:\n%s" % out)
AssertionError: svnmerge failed, with this output:
svn: Commit failed (details follow):
svn: Inconsistent line ending style
======================================================================
FAIL: Init svnmerge, modify source head, merge, rollback where no merge
----------------------------------------------------------------------
Traceback (most recent call last):
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 1065, in
testMergeAndRollbackEmptyRevisionRange
match = r"Committed revision 17")
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 469, in launch
return TestCase_SvnMerge.launch(self, cmd, *args, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 256, in launch
return self._parseoutput(ret, out, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 240, in _parseoutput
"svnmerge failed, with this output:\n%s" % out)
AssertionError: svnmerge failed, with this output:
svn: Commit failed (details follow):
svn: Inconsistent line ending style
======================================================================
FAIL: Init branch B, merge changes from branch A to branch B,
----------------------------------------------------------------------
Traceback (most recent call last):
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 1156, in
testMergeWithPotentialPropertyConflict
match=r"Committed revision 16")
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 469, in launch
return TestCase_SvnMerge.launch(self, cmd, *args, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 256, in launch
return self._parseoutput(ret, out, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 240, in _parseoutput
"svnmerge failed, with this output:\n%s" % out)
AssertionError: svnmerge failed, with this output:
svn: Commit failed (details follow):
svn: Inconsistent line ending style
======================================================================
FAIL: Test that uninit works, for both merged and blocked revisions.
----------------------------------------------------------------------
Traceback (most recent call last):
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 695, in testUninit
match=r"Committed revision 18")
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 469, in launch
return TestCase_SvnMerge.launch(self, cmd, *args, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 256, in launch
return self._parseoutput(ret, out, **kwargs)
File "C:\dev\tools\svnmerge\svnmerge_test.py", line 240, in _parseoutput
"svnmerge failed, with this output:\n%s" % out)
AssertionError: svnmerge failed, with this output:
svn: Commit failed (details follow):
svn: Inconsistent line ending style
----------------------------------------------------------------------
Ran 48 tests in 129.109s
FAILED (failures=9, errors=1)
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
