If you do "svn cp a b" and 'a' is a locally-added-not-yet-committed
file, it won't save copyfrom information, because copyfrom always has
to point to a previous revision.
--dave
On Mon, Nov 3, 2008 at 1:26 PM, Jack Bates <ms419_at_freezone.co.uk> wrote:
> 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
>
>
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
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 23:11:14 CET