[[[
Revert r19553's change for svnmerge.py as it caused
the TestCase_CommandLineOptions.testOptionOrder() test to fail.
* contrib/client-side/svnmerge.py
(my_getopt) : Removed.
(_extract_command): Modified to use getopt.getopt().
]]]
Index: contrib/client-side/svnmerge.py
===================================================================
--- contrib/client-side/svnmerge.py (revision 19593)
+++ contrib/client-side/svnmerge.py (working copy)
@@ -54,10 +54,6 @@
# - Add "svnmerge avail -R": show logs in reverse order
import sys, os, getopt, re, types, popen2, tempfile
-try:
- my_getopt = getopt.gnu_getopt
-except AttributeError:
- my_getopt = getopt.getopt
from bisect import bisect
NAME = "svnmerge"
@@ -1371,7 +1367,7 @@
opts.extend(cmd.opts)
sfl, lfl, _ = self._compute_flags(opts, check_conflicts=False)
- lopts,largs = my_getopt(args, sfl, lfl)
+ lopts,largs = getopt.getopt(args, sfl, lfl)
if not largs:
return None
return self._command(largs[0])
Revert r19553's change for svnmerge.py as it caused
the TestCase_CommandLineOptions.testOptionOrder() test to fail.
* contrib/client-side/svnmerge.py
(my_getopt) : Removed.
(_extract_command): Modified to use getopt.getopt().
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 9 23:04:55 2006