You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "Graf, Andreas" <An...@ext.eu.panasonic.com> on 2010/06/30 12:39:05 UTC
Reintegrate merge to another branch
Hi SVN folks!
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?
Environment
------------------------------------------------------------------------
-------
Win32-Client
svn, version 1.6.11 (r934486)
compiled Apr 16 2010, 10:39:09
TortoiseSVN 1.6.8, Build 19260 - 32 Bit , 2010/04/16 20:20:11
Subversion 1.6.11,
apr 1.3.8
apr-utils 1.3.9
neon 0.29.3
OpenSSL 0.9.8k 25 Mar 2009
zlib 1.2.3
Linux Server:
svn, version 1.6.6
------------------------------------------------------------------------
-------------------------
Best Regards,
Andreas Graf
..............................................................................
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.
.............................................................................
AW: Reintegrate merge to another branch
Posted by "Graf, Andreas" <An...@ext.eu.panasonic.com>.
Thank you Bob!
-----Ursprüngliche Nachricht-----
Von: Bob Archer [mailto:Bob.Archer@amsi.com]
Gesendet: Mittwoch, 30. Juni 2010 17:53
An: Graf, Andreas; Giulio Troccoli; users@subversion.apache.org
Cc: Bruedern, Ivonne
Betreff: RE: Reintegrate merge to another branch
>>> From: Graf, Andreas [mailto:Andreas.Graf@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@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@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
..............................................................................
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.
.............................................................................
RE: Reintegrate merge to another branch
Posted by Bob Archer <Bo...@amsi.com>.
>>> From: Graf, Andreas [mailto:Andreas.Graf@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@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@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
AW: Reintegrate merge to another branch
Posted by "Graf, Andreas" <An...@ext.eu.panasonic.com>.
Hi Giulio,
Thank you for your comments.
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.
Best regards,
Andreas Graf
________________________________
Von: Giulio Troccoli [mailto:Giulio.Troccoli@uk.linedata.com]
Gesendet: Mittwoch, 30. Juni 2010 14:47
An: Graf, Andreas; users@subversion.apache.org
Cc: Bruedern, Ivonne
Betreff: RE: Reintegrate merge to another branch
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?
G
Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1
6DB
Registered in England and Wales No 3027851 VAT Reg No 778499447
________________________________
From: Graf, Andreas [mailto:Andreas.Graf@ext.eu.panasonic.com]
Sent: 30 June 2010 13:39
To: users@subversion.apache.org
Cc: Bruedern, Ivonne
Subject: Reintegrate merge to another branch
Hi SVN folks!
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?
Environment
------------------------------------------------------------------------
-------
Win32-Client
svn, version 1.6.11 (r934486)
compiled Apr 16 2010, 10:39:09
TortoiseSVN 1.6.8, Build 19260 - 32 Bit , 2010/04/16 20:20:11
Subversion 1.6.11,
apr 1.3.8
apr-utils 1.3.9
neon 0.29.3
OpenSSL 0.9.8k 25 Mar 2009
zlib 1.2.3
Linux Server:
svn, version 1.6.6
------------------------------------------------------------------------
-------------------------
Best Regards,
Andreas Graf
........................................................................
......
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.
........................................................................
.....
..............................................................................
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.
.............................................................................
RE: Reintegrate merge to another branch
Posted by Giulio Troccoli <Gi...@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?
G
Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851 VAT Reg No 778499447
________________________________
From: Graf, Andreas [mailto:Andreas.Graf@ext.eu.panasonic.com]
Sent: 30 June 2010 13:39
To: users@subversion.apache.org
Cc: Bruedern, Ivonne
Subject: Reintegrate merge to another branch
Hi SVN folks!
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?
Environment -------------------------------------------------------------------------------
Win32-Client
svn, version 1.6.11 (r934486)
compiled Apr 16 2010, 10:39:09
TortoiseSVN 1.6.8, Build 19260 - 32 Bit , 2010/04/16 20:20:11
Subversion 1.6.11,
apr 1.3.8
apr-utils 1.3.9
neon 0.29.3
OpenSSL 0.9.8k 25 Mar 2009
zlib 1.2.3
Linux Server:
svn, version 1.6.6
-------------------------------------------------------------------------------------------------
Best Regards,
Andreas Graf
..............................................................................
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.
.............................................................................