[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Fwd: svn commit: r19594 - trunk/contrib/client-side

From: Madan U Sreenivasan <madan_at_collab.net>
Date: 2006-05-10 07:42:22 CEST

Max,

    Just to bring this commit to your notice... remember the getopt() to
gnu_getopt() change? It was breaking svnmerge... so we had to revert it
for svnmerge.py.

Regards,
Madan.

------- Forwarded message -------
From: djames@tigris.org
To: svn@subversion.tigris.org
Cc:
Subject: svn commit: r19594 - trunk/contrib/client-side
Date: Wed, 10 May 2006 02:37:45 +0530

Author: djames
Date: Tue May 9 14:07:44 2006
New Revision: 19594

Modified:
    trunk/contrib/client-side/svnmerge.py

Log:
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().

Modified: trunk/contrib/client-side/svnmerge.py
URL:
http://svn.collab.net/viewvc/svn/trunk/contrib/client-side/svnmerge.py?pathrev=19594&r1=19593&r2=19594
==============================================================================
--- trunk/contrib/client-side/svnmerge.py (original)
+++ trunk/contrib/client-side/svnmerge.py Tue May 9 14:07:44 2006
@@ -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])

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

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed May 10 07:11:53 2006

This is an archived mail posted to the Subversion Dev mailing list.