[Svnmerge] updates for python 2.6?

[Dustin J. Mitchell]

Thanks -- committed:

------------------------------------------------------------------------
r36518 | dustin | 2009-03-12 16:51:56 -0400 (Thu, 12 Mar 2009) | 8 lines

* svnmerge.py
  move import of popen2 to the version of launch() used when subprocess
  is not available, since popen2 is deprecated in Python-2.6

Suggested by: giovannibajo
Patch by: Jon Schewe <jpschewe at mtu.net>
Review by: me

-- 
Storage Software Engineer
http://www.zmanda.com