Ah. But checking it also hides the revisions that came before the
branch, if the LogFindCopyFrom option is set. Would it make sense to
always show it on the merge dialog's "show log" if this option is set
(and the two branches share history)?
On Wed, Jul 9, 2014 at 12:57 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 09.07.2014 17:11, Ben Fritz wrote:
>> According to http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html
>> there should be a "Hide unmergeable revisions" checkbox in the Show
>> Log dialog when accessed from the Merge dialog. I remember testing
>> this feature before, there is even a record of it:
>> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3074621
>>
>> But the button is missing now! I don't see it on either "show log"
>> dialog accessed from a merge, when my working copy is on a branch, and
>> I'm merging from trunk. I checked and I still have the LogFindCopyFrom
>> setting as "true" in the Advanced Settings dialog.
>>
>> Is there some setting I may have inadvertently set to remove this
>> checkbox? Or maybe some characteristic of my repository history that
>> prevents it from showing? It's still supported, right? Where it is
>> supposed to appear anyway? I can't find a screenshot showing this
>> feature.
>
> the box is shown if there are already merged revisions shown in the log
> dialog. If there are no revisions shown that have already been merged,
> the checkbox "hide unmergeable revisions" is not shown because it would
> be useless and do nothing.
>
> So: if you don't see any revisions shown in gray when the log dialog is
> started from the merge dialog, then the checkbox is not shown (because
> checking it would hide the gray revisions).
>
> 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=3084836
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3084850
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-07-10 02:49:40 CEST