[Svnmerge] KeyError on svnmerge.py

[Hernan Martinez-Foffani Silva]

> > Therefore, should the attached patch solve the issue?
>
> Yes, it looks like a good idea.
>
> > I don't know if this will regress svnmerge.py on Romulo's problem. The
> > testCommitMessageEncoding test case passes on my machine, but the test
> > case is heavily dependent on the machine environment in which it is
> > run. It would be helpful if Romulo could test this but I've been
> > getting bounces on his email address.
>
> You can try reverting Romulo's patch and verifying that the test fails
> with that patch reverted.

svnmerge_test.py from HEAD over svnmerge.py revision 29665 fails one test.
Works ok on HEAD with Raman's latest patch applied

Regards,
-H.
--------------------------------
Session follows:

D:\proyectos>svn co -r 29665
http://svn.collab.net/repos/svn/trunk/contrib/client-side/svn
merge
A    svnmerge\svnmerge.sh
A    svnmerge\svnmerge-migrate-history.py
A    svnmerge\svnmerge-migrate-test.sh
A    svnmerge\svnmerge.README
A    svnmerge\svnmerge_test.py
A    svnmerge\svnmerge.py
 U   svnmerge
Revisión obtenida: 29665

D:\proyectos>cd svnmerge

D:\proyectos\svnmerge>copy ..\svnmerge-head\svnmerge_test.py .
¿Sobrescribir .\svnmerge_test.py? (Sí/No/Todos): s
        1 archivos copiados.

D:\proyectos\svnmerge>svnmerge_test.py
.........................F........................
======================================================================
FAIL: Init svnmerge, modify source head and commit with a message
----------------------------------------------------------------------
Traceback (most recent call last):
  File "D:\proyectos\svnmerge\svnmerge_test.py", line 1297, in
testCommitMessageEncoding
    self.launch('svn log -r 16', match=commit_msg.encode(output_encoding))
  File "D:\proyectos\svnmerge\svnmerge_test.py", line 480, in launch
    return TestCase_SvnMerge.launch(self, cmd, *args, **kwargs)
  File "D:\proyectos\svnmerge\svnmerge_test.py", line 266, in launch
    return self._parseoutput(0, out, **kwargs)
  File "D:\proyectos\svnmerge\svnmerge_test.py", line 253, in _parseoutput
    "pattern %r not found in output:\n%s" % (match, out))
AssertionError: pattern 'adi\x87\xc6o no reposit\xa2rio' not found in output:
------------------------------------------------------------------------
r16 | Hernan | 2008-03-09 18:45:40 +0100 (dom, 09 mar 2008) | 17 lines

Merged revisions 9-10,15 via svnmerge from
file:///D:/TEMP/__svnmerge_test/repo/trunk

........
  r9 | Hernan | 2008-03-09 18:44:31 +0100 (dom, 09 mar 2008) | 1 line

  add test4
........
  r10 | Hernan | 2008-03-09 18:44:32 +0100 (dom, 09 mar 2008) | 1 line

  add test5
........
  r15 | Hernan | 2008-03-09 18:45:37 +0100 (dom, 09 mar 2008) | 1 line

  adi_Æo no reposit¢rio
........

------------------------------------------------------------------------


----------------------------------------------------------------------
Ran 50 tests in 161.828s

FAILED (failures=1)

D:\proyectos\svnmerge>