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

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

From: Robert P. J. Day <rpjday_at_crashcourse.ca>
Date: Wed, 21 Jan 2009 16:40:12 -0500 (EST)

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.


Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry:
    Have classroom, will lecture.
http://crashcourse.ca                          Waterloo, Ontario, CANADA
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-01-21 22:41:45 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.