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

Re: Weird merge error: "<file> has different repository root"

From: Ryan Schmidt <subversion-2009a_at_ryandesign.com>
Date: Thu, 22 Jan 2009 02:55:49 -0600

On Jan 21, 2009, at 15:40, Robert P. J. Day wrote:

> For weeks now, I've been using "merge" to pull over commits one at a
> time from one repo to my working copy of a different repo, manually
> fixing any conflicts, then committing.
> Just today, doing what's worked for all that time, one of the files
> in a commit involving several files gave me an error of "<filaA> has
> different repository root than <fileB>".
> well, yes, of *course* it does -- that's the whole point of my
> pulling merges across from one repo to another. so why would that
> error occur? doing a "--dry-run" of the merge doesn't complain about
> that file -- it just shows that the file would be "A"dded.
> so what should i be looking for? subversion 1.4.3, sadly.

It did not used to be supported to merge across different
repositories, only within a single repository.

Definitely update to Subversion 1.5.5 first and see if that helps.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-01-22 18:17:58 CET

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.