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

Re: Even more merge thoughts...

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 29 Nov 2011 21:20:53 +0100

On Tue, Nov 29, 2011 at 21:14, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 29.11.2011 12:31, Hans-Emil Skogh wrote:
>> - In the Merge dialog when the "Show log" button is clicked, the Log
>> dialog that opens will list revisions as far back as it can. This is
>> mostly not what you want. I would say that the usual case would be to
>> show revisions that are younger than the branch. Doing this would
>> prevent the additional clutter of showing lots of revisions that are
>> already, implicitly, part of the branch. I would suggest to add yet
>> another checkbox to the log dialog that says "Stop on branch
>> creation". This checkbox would _only_ be visible when the log dialog
>> is opened from the Merge dialog. The check box should be checked by
>> default.
>
>
> When the log dialog is started from the merge dialog, the "stop on copy"
> checkbox is checked by default. So it should stop at the branch creation.

Ok, that checkbox doesn't really help.
But there's an advanced option to find the start revision of the
branch in these situations:
Settings->Advanced->LogFindCopyFrom - set to true
But please be aware that this doesn't work for Google Code
repositories (see here for why:
http://code.google.com/p/support/issues/detail?id=5471 ), and for
other repositories it can take a long time to find that revision.
That's why it's disabled by default.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2889126
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-11-29 21:21:20 CET

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

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