Hernan Martinez Foffani <[EMAIL PROTECTED]> wrote on 08/02/2007
01:05:59 PM:
> [EMAIL PROTECTED] wrote:
> > Piet-Hein Peeters wrote:
> >>> If only I had a windows box to test this on :(
> >>>
> >>>
>
http://subversion.tigris.org/nonav/issues/showattachment.cgi/691/fixWindowsL
> ineTermFailures.patch
> >>
> >> I've tested your patch, but I'm sorry to say it didn't work:
> >
> > I think your parameters to re.sub are backwards. There's also the
> > error in test_basic (__main__.TestCase_launch) due to windows not
> > having a "dir" executable. This patch should address both those
> > issues, it is passing on my windows boxes here.
> >
> >
>
http://subversion.tigris.org/nonav/issues/showattachment.cgi/692/fixWindowsL
> ineTermFailures.patch
>
> Confirmed.
> Last patch of issue 2813 works OK on Windows when applied
> to trunk.
> But I know nothing about Macs. :(
Test passed here also. I was able to commit the log message with the patch
applied on svnmerge.py
svnmerge_test.py still showed one non-related Failure:
(See attached file: svnmerge_test_output.txt)
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
----------------------------------------------------------------------------
F...............................................
======================================================================
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:
/trunk
/branches/pmw
----------------------------------------------------------------------
Ran 48 tests in 184.015s
FAILED (failures=1)_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge
