You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Murli Varadachari <mv...@facebook.com> on 2008/09/15 23:26:20 UTC
Trouble using Svn merge --reintegrate
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
Re: Trouble using Svn merge --reintegrate
Posted by Murli Varadachari <mv...@facebook.com>.
On 9/15/08 4:30 PM, "John Peacock" <jo...@havurah-software.org>
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
>
Re: Trouble using Svn merge --reintegrate
Posted by John Peacock <jo...@havurah-software.org>.
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@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org