[Svnmerge] Regression in Dustin's inter-repository patches?

[Juan Manuel Palacios]

	Hello all!

	I write again to report some problems with Dustin's inter-repository  
support work in svnmerge.py. But this time what I'm seeing seems more  
like a regression, as I'd been using the enhanced tool without  
experiencing the following problem until just now:

-> svnmerge.py merge

property 'svnmerge-integrated' deleted from '.'.

property 'svnmerge-blocked' deleted from '.'.

svnmerge: command execution failed (exit code: 1)
svn merge --force -r 27517:27711 http://svn.macports.org/repository/ 
macports/trunk/base .
U    Makefile.in
U    ChangeLog
U    src/Makefile.in
svn: Access scheme mixtures not yet supported ('http:// 
svn.macports.org/repository/macports/trunk/base/src/registry2.0' and  
'svn://localhost/macports/trunk/base/src')


	The version of svnmerge.py I'm using is one Dustin sent personally  
to me, with the following info:

# $HeadURL: https://svn.collab.net/repos/svn/trunk/contrib/client- 
side/svnmerge/svnmerge.py $
# $LastChangedDate: 2007-08-03 11:59:44 -0500 (Fri, 03 Aug 2007) $
# $LastChangedBy: dustin $
# $LastChangedRevision: 25944 $

	But I'm not sure if that's just the official repo information and if  
it reflects Dustin's latest (I believe still uncommitted) changes. In  
any case, I'd been using svnmerge.py to merge from the official, http  
served, MacPorts repository back into my local, svnserve served, copy  
until just now without experiencing the above conflict, an apparent  
reluctance to mix access protocols. And it's also even more confusing  
because the merge does actually start, hinting that it can in fact  
handle http:// and svn:// mixtures in a merge.... but then fails.

	Or am I simply reading that error incorrectly and not understanding  
what the failure is about? Mac OS X 1.4.10 with svn 1.4.4 and Python  
2.4.4. Any other relevant system information I could supply?

	Thanks for the help! Regards,...


-jmpp