[Svnmerge] svnmerge between multiple repositories, same repo path

Juan Manuel Palacios jmpp at macports.org
Mon Sep 17 09:16:45 PDT 2007


On Sep 17, 2007, at 8:50 AM, Piet-Hein Peeters wrote:

> Hello Dustin et all,
>
> In the near future we probably need merge and merge-tracking  
> functionality between multiple repostiories. I've found the e-mail  
> below to which you attched some patches.
> Does these patches provide the possibility to merge across  
> different repositories?
> Can I apply these patches to the latest version of svnmerge.py?
>

	 I went over this rather extensively with Dustin a while ago and the  
overall conclusion is that his enhancements to svnmerge.py to handle  
inter-repository merging are unfortunately limited by subversion's  
own inability to handle that chore. You'll be able to do it as long  
as you don't try to bring in any new additions or removals from the  
remote repo; that is, you'll only be able to merge updates, no file/ 
directory additions/removals. You'll also run into trouble if you mix  
access protocol, if one repo is in http:// and the other in svn://  
for instance. Other than those rather crippling limitations, inter- 
repository merging works with Dustin's enhancements to svnmerge.py
>
> If so, is there a small how-to available to help me get started  
> with merging and merge tracking accross multiple archives.
>

	All you have to do is supply a -L flag & argument to the 'init'  
operation in Dustin's svnmerge.py, the argument being the unique  
identifier (URL or repo UUID) by which you want to identify the  
remote repo wherefrom you'll be importing changesets.

	HTH!


-jmpp




More information about the Svnmerge mailing list