Failing to --reintegrate branch

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.

Here's the history:

I created a branch a week ago and then did an svn switch:

    svn cp http://example.com/svn/trunk/foo http://example.com/svn/branches/foo_branc

I noticed the spelling error and then did a move to correct the name:

    svn mv http://example.com/svn/branches/foo_branc http://example.com/svn/branches/foo_branch

Then I did the switch:

    svn switch http://example.com/svn/branches/foo_branch

I've been working on that branch quite a bit, making changes and
checking in. Every day or so I merge in any changes from trunk:

    svn merge http://example.com/svn/trunk/foo

and that's been working perfectly.

Today it's time to merge my branch back into trunk. I first did
another merge from trunk to make I'm up to date, and then did a final
check-in:

    svn merge http://example.com/svn/trunk/foo
    svn ci

When I do that process there's a lot of files marked

    _M (note the underscore).

Then once I checked in my branch I moved to another computer with a
checkout of trunk. I updated and then tried to reintegrate:

(I have some svn externals defined)

    svn info | grep URL
    URL: http://example.com/svn/trunk/foo

    svn update
    Fetching external item into 'root/static/resources/multimedia/promotional'
    External at revision 1205.

    Fetching external item into 'root/static/resources/image_bin'
    External at revision 1205.

    At revision 2638.

Then I get this:

    svn merge --reintegrate http://example.com/svn/branches/foo_branch

    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.

-- 
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