Trouble using Svn merge --reintegrate

[Murli Varadachari-2]

I can’t get “svn merge —reintegrate” to work . I have been merging from trunk to this branch frequently

Here is the error message

svn: Cannot reintegrate from 'svn+ssh://host/svnroot/tfb/branches/globs/www' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.




Example:

Properties on my branch branch ==>

Properties on 'svn+ssh://host/svnroot/tfb/branches/glob/www':

  svn:mergeinfo : /tfb/trunk/www:78849-121709

Note: 78849 was the branch creation point — from trunk

Now I am trying to reintegrate all the changes from branch to trunk.
 
svn merge —reintegrate  svn+ssh://host/svnroot/tfb/branches/globs/www

and it fails.

However if I run a manual merge it works from branch => trunk  ti appears to work

svn merge svn+ssh://host/svnroot/tfb/trunk/www    svn+ssh://host/svnroot/tfb/branches/globs/www  <trunk-WC>


Am I missing something? The branch was created pre 1.5.

Cheers
murli

[John Peacock-4]

Murli Varadachari wrote:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.

That error is telling you that something on trunk hasn't been merged to the
branch yet, so you can't use reintegrate.  Merge from trunk to branch, then
branch to trunk with --reintegrate and you should be golden.

HTH

John

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@...
For additional commands, e-mail: users-help@...

[Murli Varadachari-2]

On 9/15/08 4:30 PM, "John Peacock" <john.peacock@...> wrote:

Murli Varadachari wrote:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.

>>>That error is telling you that something on trunk hasn't been merged to the
>>>branch yet, so you can't use reintegrate.  Merge from trunk to branch, then
>>>branch to trunk with --reintegrate and you should be golden.

I merged everything from the trunk to the branch [ as specified  by “svn log —stop-on-copy  <branch> ” ] -- the svn:mergeinfo  indicates the correct revisions. It would have been nice if there was a “-v” option to the command — this message is too cryptic.

Att this point I am reverting to a manual merger “svn merge URL:/trunk/www URL:/branch/www  [trunk-WC]”  which seems to work.

Hopefully the next branch will turn out ok

HTH

John