Oh, sorry, I was speaking only of release branches, not feature
branches. In our shop, we don't merge entire branches back into the
trunk.
On 11/19/08, Bob Archer <Bob.Archer_at_amsi.com> wrote:
> I have not tried this. But I expect that if you merge a revision from
> trunk to branch and then you try to merge branch into trunk you will get
> a conflict since the change already exists in trunk.
>
> I think you have to decide to do one or the other... is this a feature
> branch which you keep trunk changes integrated into or is this a release
> branch where you only want to bring in changes made to the release back
> into the dev trunk?
>
> BOb
>
>
> -----Original Message-----
> From: Waynn Lue [mailto:waynnlue_at_gmail.com]
> Sent: Wednesday, November 19, 2008 3:29 PM
> To: Bob Archer; Rush Manbert; subversion
> Subject: Re: Branch Merging Question
>
> It's also possible to make the change to trunk, and then merge that to
> the branch as well, right? Is one method preferred over another?
>
> Waynn
>
> On 11/19/08, Bob Archer <Bob.Archer_at_amsi.com> wrote:
>> I was confused on this point to. There are basically two scenarios
> here.
>> One supports branch for feature and another supports branch for
> release.
>>
>> When you do a branch for feature the assumption is that you will be
>> merging from trunk to the branch so you can keep the branch up to
> date.
>> You do this by in the branch wc doing the following command.
>>
>> Svn merge svn://path/to/trunk
>>
>> This will merge everything from the point of the last merge from trunk
>> (the copy if there have been no earlier merges) to the head of trunk.
>> When you commit this to branch the merge properties are created in
>> branch to keep track. When you have completed your feature you need to
>> -reintegrate the branch into the trunk by running to following command
>> from the wc of the trunk.
>>
>> Svn merge svn://path/to/branch --reintegrate
>>
>> This will bring all the changes that are in the feature branch into
>> trunk and then you should delete the branch.
>>
>> However, merge tracking also works for a release branch where you do
> NOT
>> want to bring stuff from trunk into it, but you do want to bring
> changes
>> from the branch back into trunk.
>>
>> In this instance in your trunk wc you can run the following command:
>>
>> Svn merge svn://path/to/branch
>>
>> And it will bring all the changes made in the branch into trunk. When
>> you commit this merge it will save mergeprops so it will remember what
>> -r of branch were brought in. So, a week later, or whenever you can do
>> from the trunk wc again another
>>
>> Svn merge svn://path/to/branch
>>
>> And it will bring anything that was changed in branch since the last
>> merge.
>>
>> I have tested this and it works very well.
>>
>> BOb
>>
>>
>> -----Original Message-----
>> From: Rush Manbert [mailto:rush_at_manbert.com]
>> Sent: Wednesday, November 19, 2008 12:45 PM
>> To: subversion
>> Subject: Branch Merging Question
>>
>> In response to my stupid "Bad Merge Behavior" posts (The bad behavior
>> was all my fault.), a couple of people have suggested that when
>> merging a branch back to the trunk, you must first merge from the
>> trunk to the branch, then do a reintegration merge from the branch
>> back to the trunk.
>>
>> While this might be a better way to go, I was under the impression
>> that you could just create your branch, make changes, then merge from
>> the branch back to the trunk. Is this wrong? Must we do the
>> reintegration merge in every case?
>>
>> - Rush
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
>> For additional commands, e-mail: users-help_at_subversion.tigris.org
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
>> For additional commands, e-mail: users-help_at_subversion.tigris.org
>>
>>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-19 22:17:34 CET