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

"must be ancestrally related"

From: Jack Bates <ms419_at_freezone.co.uk>
Date: Mon, 03 Nov 2008 13:26:53 -0800

I want to take advantage of the merge tracking features in Subversion
1.5, to automatically merge outstanding changes from one branch to
another. But I keep getting an error like:

ket% svn merge --reintegrate file:///home/jablko/test/a b
svn: 'file:///home/jablko/test/a_at_2' must be ancestrally related to
'file:///home/jablko/test/b_at_1'
ket%

This is despite creating "b" using "svn cp a b"

I previously posted this question to subversion-users:
http://thread.gmane.org/gmane.comp.version-control.subversion.user/82282

At the time, I thought the problem might be my Subversion repository
version, because I originally created the repository with Subversion 1.4
svnadmin. But I now tried creating a new repository with Subversion
1.5.1 svnadmin, and using only a Subversion 1.5.1 client to copy,
checkin, and merge. I see the same error. Here is a screenlog of the ten
commands which demonstrate the error I keep getting:
http://cgi.sfu.ca/~jdbates/tmp/svn/200811030/screenlog

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-03 22:27:07 CET

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

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