On 11/6/05, John Joseph Bachir <johnjosephbachir@gmail.com> wrote:
> > Merging from one repos can be done, but more by happenstance than
> > intentional design at this point.
> >
> > Please give us the exact commands and outputs, otherwise we cannot
> > reproduce in any way.
>
> anonymized to protect the innocent:
>
> $svn merge -r<old>:<new> http://foreign.repository.tld
>
> svn: Access scheme mixtures not yet supported
> ('http://foreign.repository.tld/path/to/new/file.gif' and
> 'svn://my.repository.tld/path/to/directorywherenewgifshouldgo')
>
I've seen people able to do a merge from one repos with svn protocol
into a working copy of a different repos working copy. It looks like this
case is explicitly checked since one is http and the other is svn.
If it's only a few files you could try svn cat. Or check out a working
copy of the http repos and use svn_load_dirs.pl to handle the merge
into you're local one.
Alternatively svk or SVN::Mirror might be able to help, but svn_load_dirs.pl
is the recommended way to handle vendor branches:
http://svnbook.red-bean.com/nightly/en/svn.advanced.vendorbr.html
about 2/3 of the way down.
Josh
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Nov 6 19:38:06 2005