You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by CB <cb...@gmavt.net> on 2008/07/31 16:59:08 UTC
Problem with --reintegrate, subversion 1.5
Hello,
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".
What am I doing wrong?
Thanks for any advice...
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Problem with --reintegrate, subversion 1.5
Posted by Mark Phippard <ma...@gmail.com>.
On Thu, Jul 31, 2008 at 1:08 PM, CB <cc...@gmail.com> wrote:
> On Thu, Jul 31, 2008 at 1:03 PM, Mark Phippard <ma...@gmail.com> wrote:
>> On Thu, Jul 31, 2008 at 12:59 PM, CB <cb...@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/
>
> I have seen that article. It only mentions move/rename as a cause of
> the problem. As mentioned in the OP, I neither moved or renamed any
> files.
> 1. Create branch.
> 2. Edit file in branch.
> 3. Commit, in branch.
> 4. 'merge --reintegrate <branch URL>' in trunk WC; get error.
Please include the list in any replies.
As I it says in the post, and I reiterated above, it does not matter
what you did on the branch. If trunk already has sub-tree mergeinfo
it gets carried into the branch.
BTW, since you did not do any merges from trunk to the branch you can
merge the branch back to trunk without the --reintegrate option. You
only really need to use --reintegrate when you have been keeping the
branch in synch with trunk.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Problem with --reintegrate, subversion 1.5
Posted by Mark Phippard <ma...@gmail.com>.
On Thu, Jul 31, 2008 at 12:59 PM, CB <cb...@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@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org