Another small batch of compatibility fixes: after this, svnmerge is finally fully compatible with Python 2.0.
Another small batch of compatibility fixes: after this, svnmerge is finally
fully compatible with Python 2.0.

* contrib/client-side/svnmerge_test.py:
  (_run_propset): Use open, not file
  (CommandOpts._fancy_getopt, CommandOpts.parse): Adjust for Python before 2.3
  which didn't have gnu_getopt.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion