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

Re: Update feature branch with trunk changes before merging.

From: Brian T <brian.tabios_at_gmail.com>
Date: Wed, 8 Jun 2011 13:39:41 -0600

Hi Bob,

Thanks for the reply. What's the differences between a "reintegrate merge"
and a regular "range of revisions" merge?

When merging from the branch to the trunk (after setting my WC to the
trunk), I was thinking of doing the same "range of revisions" merge and
selecting the head of the branch.

On Tue, Jun 7, 2011 at 5:38 PM, Brian Tabios <brian.tabios_at_gmail.com> wrote:

> Hi Tim,
>
> Thanks for the help. My WC is the feature branch.
> I've finished doing a "Merge revision range" from the trunk. I sequentially
> selected each revision manually and resolved the conflicts.
> Now I'm ready to merge the branch back into the trunk.
>
> What are the next steps? I suppose I should commit these changes into the
> branch. Then I should set my WC to the trunk and do a merge from the branch.
> Is that correct?
>
> Thanks for the help!
>
>
> On Tue, Jun 7, 2011 at 2:00 PM, Brian Tabios <brian.tabios_at_gmail.com>wrote:
>
>> I need to merge a feature branch back into the trunk. My WC copy points to
>> the feature branch. I haven't merged any of the trunk into my branch yet.
>> The documentation says that before reintegrating my branch, I should keep
>> the branch in sync with the trunk changes. What's option in TortoiseSVN do I
>> use to update my branch with the latest trunk changes?
>>
>
>

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2760530

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-06-08 21:39:49 CEST

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

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