[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

what's the current deal with merging across repositories?

From: Robert P. J. Day <rpjday_at_crashcourse.ca>
Date: Sat, 23 Aug 2008 09:25:16 -0400

   the short question: what's the status on being able to merge
*across* repositories?

   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:


   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.


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.

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-23 15:25:41 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.