[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: Fri, 03 Oct 2008 09:03:40 -0700

I am trying to take advantage of Subversion 1.5's new merge tracking
feature. I imported a project to (A):

- and then used "svn cp" to copy that project to (B):

Now, I expect that running:

$ svn merge --reintegrate
http://artefactual.com/svn/qubit/trunk/symfony/vendor lib/vendor/symfony

- in a http://artefactual.com/svn/qubit/trunk/qubit working copy, should
merge all outstanding changes from A to B. Instead however, I get the
following error:

$ svn merge --reintegrate
http://artefactual.com/svn/qubit/trunk/symfony/vendor lib/vendor/symfony
svn: 'http://artefactual.com/svn/qubit/trunk/symfony/vendor@1428' must
be ancestrally related to

I thought that by using "svn cp" to copy A to B, B and A would be
ancestrally related? What is wrong?

One wrinkle is that the repository was created a year ago with
Subversion 1.4 "svnadmin create". The server was upgraded to Subversion
1.5 *before* I ran "svn cp", and I used a Subversion 1.5 client to "svn
cp". However I upgraded the repository to the Subversion 1.5 format
using "svnadmin upgrade" and "svn-populate-node-origins-index" *after* I
ran "svn cp". Could this be the problem?

  • application/x-pkcs7-signature attachment: smime.p7s
Received on 2008-10-03 18:04:27 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.