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

Re: About 4.20.7. Merge a Completed Branch

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 05 Aug 2014 20:18:36 +0200

On 05.08.2014 07:16, 吉川広 wrote:
> The following description is In Chapter 4.20.7 of the PDF Manual.
> ---------------------------------
> If you want to merge all changes from a feature branch back to trunk, then
> you can use the TortoiseSVN →
> Merge reintegrate... from the extended context menu (hold down the Shift key
> while you right click on the file).
> ---------------------------------
>
> If the right clicked file or folder is a trunk working copy , then
> How does TortoiseSVN know which brach is wanted to merge?
>
> Actually this command is failed on trunk working copy!
>
> But on brach working copy, this command functions neatly.
> (not branch back to trunk but trunk to branch)
>
> What true intention is this command?

Thanks for noticing!
This is actually a bug in the docs and the name of the context menu.
The menu should actually say "Merge all..." instead of "Merge
reintegrate...".
Also, it's purpose is to merge all changes from trunk into a feature
branch, bringing the feature branch up to date with the trunk.

A reintegrate-merge is done via the merge dialog by simply leaving the
revisions-to-merge empty.

I'll fix the docs and the context menu.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3086262
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-08-05 20:18:48 CEST

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