Branching and merging...

I checked out the most recent version of the 0.9.x trunk (http://svn1.cvsdude.com/rethrash/tattoo/tattoo/trunk) and I’m trying to merge it into my current revision locally. The local revision is under my own version control server but the code is that of MODx SVN rev2258.

So I want to merge the MODx SVN trunk to my own, so my command looks like this:


The folder in that command points to the checked out version of the MODx trunk. I’m merging both folders locally because my version of SVN doesn’t support access scheme mixing (http, i use svn+ssh).

However, the merging doesn’t work, I still get the ’Access scheme mixtures not yet supported’ error.

Is there anyone who can offer some help? I’m still kind of an SVN n00b...

Unfortunately sirlancelot, that’s one of the big issues I hope they solve for the next release of Subversion, but that’s the long and short of it; you simply can’t perform operations with mixed access schemes. Feel free to create yourself a private branch under branches in the MODx repository, but the only way it will work is if you match the access schemes of the source and target merges.

Another reason to use a MODx hosted SVN branch is that merges between disparate repositories cannot take ancestry into account, so you would not have the advantage of three-way merges and would be forced to use the ignore ancestry switch when merging between the two.

Thanks Jason, I’ll move my work to a branch in the MODx repository when I have time....

For now, I sort of solved my issue using [tt]rsync[/tt] like so:

It’s only a one way transfer, but this way I can still keep up to date with the SVN trunk while still working on my own version control server.

Quote from: sirlancelot at Feb 27, 2007, 05:22 PM

Thanks Jason, I’ll move my work to a branch in the MODx repository when I have time....

For now, I sort of solved my issue using [tt]rsync[/tt] like so:

$rsync -aCv modtest/modx-0.9.6/ MODx/

It’s only a one way transfer, but this way I can still keep up to date with the SVN trunk while still working on my own version control server.

Score! Nice use of rsync