svnmerge.py r26037 on Windows

I tried to run r26037 of svnmerge.py on Windows and got an error:

Traceback (most recent call last):
  File "svnmerge.py", line 2124, in ?
  File "svnmerge.py", line 2119, in main
  File "svnmerge.py", line 1609, in __call__
  File "svnmerge.py", line 1278, in action_merge
  File "svnmerge.py", line 1087, in analyze_source_revs
  File "svnmerge.py", line 1039, in analyze_revs
  File "svnmerge.py", line 359, in __init__
  File "svnmerge.py", line 846, in __init__
  File "xml\dom\pulldom.pyc", line 350, in parseString
  File "xml\sax\__init__.pyc", line 93, in make_parser
xml.sax._exceptions.SAXReaderNotAvailable: No parsers found

I fixed this by adding from xml.parsers import expat to the script. A
patch is attached.

Is this the correct fix for this?

-- 
Martin Tomes
martin@tomes.org.uk

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org