Re: Problem with --reintegrate, subversion 1.5

On Thu, Jul 31, 2008 at 12:59 PM, CB <cbne_at_gmavt.net> wrote:

> I have tried to follow the guide in the Subversion book for creating a
> branch, updating from trunk, and reintegrating the branch to the
> trunk.
>
> Unfortunately, I keep getting this error when trying to reintegrate:
> :::::::
> [C:\temp\SVNTest\Test2\trunk]
>> svn merge --reintegrate <URL>/Test2/branches/work
> svn: Cannot reintegrate from '<URL>/Test2/branches/work' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
> ::::
> This occurs after exactly one change to one file in branches/work. No
> file renames or moves.
> I used "svn copy" to create the branch named "work", changed one file
> in work, commited, then tried to run the "merge --reintegrate".

Give this a read:

http://blogs.open.collab.net/svn/2008/07/subversion-merg.html

For example, if you renamed something in the trunk then later create
the branch you can still get this problem. The blog gives an
explanation and some things you can do to get out of it.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org