[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

AW: Reintegrate merge to another branch

From: Graf, Andreas <Andreas.Graf_at_ext.eu.panasonic.com>
Date: Wed, 30 Jun 2010 17:56:29 +0200

Thank you Bob!

-----Ursprüngliche Nachricht-----
Von: Bob Archer [mailto:Bob.Archer_at_amsi.com]
Gesendet: Mittwoch, 30. Juni 2010 17:53
An: Graf, Andreas; Giulio Troccoli; users_at_subversion.apache.org
Cc: Bruedern, Ivonne
Betreff: RE: Reintegrate merge to another branch

>>> From: Graf, Andreas [mailto:Andreas.Graf_at_ext.eu.panasonic.com]
>>> We are using Tortoise reintegrate successfully to merge changes
>>> back to the branch that have been used for branch-off.
>>> But if we are using reintegrate to apply the same differences to
>>> another branch, we are getting bad merge results.
>>> Is there a bug-fix for that problem available or is it only
>>> possible to do that merge using range-merging?

>> Von: Giulio Troccoli [mailto:Giulio.Troccoli_at_uk.linedata.com]
>> I don't think is possible to use --reintegrate. You can always to a
>> "old style" merge with a revision range.
>> But there is something I don't understand. I presume you have
>> created both branches from trunk, so after you have reintegrated
>> the first branch, isn't it ebough to do a merge from trunk in the
>> second branch?

> From: Graf, Andreas [mailto:Andreas.Graf_at_ext.eu.panasonic.com]
> From my point of view, the bennefit of reintegrate is that users do
> not have to take care about the used revisions, so we would like to
> use that functionality for submitting changes to other branches
> too. For instance when we have to provide patches to a test-branch
> before patches are merged back to trunk.

--reintegrate is used to merge changes made to a branch (copy really) back to its parent/ancestor path.

So, your point of view is a bit skewed. Since your branch is not a child copy of the other branch you can not use --reintegrate.

You have several options... you can merge from one branch to the other. It just wouldn't be an integration merge... it would be a regular merge. Merge tracking will ensure that you don't merge the same changes more than once.

Say you have....


In the above you copied /trunk to /branch/Feature one. You then branched /branch/Fature1 to /branch/Feature1.1.

Let's assume you have made changes to feature 1 and finished those changes. You can --reintegrate Feature1 into trunk. That is fine, since that was its ancestral parent.

However, if you want to bring everything you did in Feature1 to Feature1.1 you would merge from /Feature1 into /Feature1.1 but it would NOT be a reintegration merge.

Bottom line... reintegrate is always used to put the changes made on a branch back into its parent assuming you have merged all changes made on the parent into that branch first.


Confidentiality Notice
The information contained in this Email, and any attachments, is intended for the named recipients only. It may contain confidential and/or legally privileged information. If you are not the intended recipient, you must not copy, store, distribute or take any action in reliance on it. Any views expressed do not necessarily reflect the views of the company.

If you receive this Email by mistake, please advise the sender by using the reply facility in your Email software and then delete it.
Received on 2010-06-30 17:58:10 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.