On Aug 23, 2008, at 08:25, Robert P. J. Day wrote:
> the short question: what's the status on being able to merge
> *across* repositories?
Merging across repositories is not supported. If it worked before,
that was a coincidence.
> the longer setup: yes, i realize you're not supposed to be able
> to do that and i recall from a while back that you *could* do that,
> but then that feature was removed in 1.4:
>
> http://www.nabble.com/svn-merge-bug-td11040641.html
>
> why i'm asking: i set up a new repo for a colleague, whereupon
> he almost immediately (with svn 1.4.3) tried to merge a range of
> revisions from someone else's repo, and it *almost* worked. as in,
> it nicely merged *updates*, but immediately croaked on the first
> revision that represented adding a *new* file, with the inevitable
> error msg:
>
> svn: Copyfrom-url <snafu> has different repository root than <fubar>
>
> when he showed me what had happened, i smugly explained, "well,
> that's because you can't merge across repo ... um, hang on, all
> those updates seemed to merge perfectly fine, what's going on here?"
>
> so ... what *is* going on here? and since i'm pushing to upgrade
> the system here to svn 1.5, what should i *expect* in terms of
> merge behaviour? thanks.
You should expect merge across repositories to throw an error and not
work.
> p.s. perhaps i'm missing it, but ch 4 in the svn book doesn't
> explicitly state that merging is not meant to be done across
> repos. that's a pretty big point not to make abundantly clear.
> and "svn help merge" also doesn't seem to explain that restriction,
> either.
Book feedback can be sent to the Book mailing list. See http://
svnbook.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-25 05:22:01 CEST