Re: Failing to --reintegrate branch

On Fri, Nov 14, 2008 at 01:13:27PM -0800, Bill Moseley wrote:
> Subversion 1.5.1 on the client.
>
> I need help with an error I'm getting:
>
> svn: Cannot reintegrate from 'http://example.com/svn/branches/foo_branch' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.

This problem is described here:

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

Under "Problems with Reintegrate and Renamed Files"

I'm pretty sure I did not do any "subtree merges" -- if that means
running svn merge anywhere but at the top of my working copy.

In my case the point of the branch was to do a reorganization of the
repoisotry. We were using svn:external to bring in other
repos, so the branch was to do away with those externals.

I also svn moved a number of files, and renamed a number of items.
All reasonable things to do.

So, the two solutions offered in that post are to propdel
svn:merginof or do the old 2-URL merge.

For the prodel, I'm not clear on what objects to do that on.
The example is:

    svn propdel svn:mergeinfo FOO

but for what FOOs?

If I have to go the old route, how do I determine the two URLs to use
to do the reintegration?

-- 
Bill Moseley
moseley_at_hank.org
Sent from my iMutt
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org