>>> From: Graf, Andreas [mailto:andreas.g...@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.trocc...@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.g...@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.... /trunk /branch/Feature1 /branch/Feature1.1 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. BOb
