Re: Re: Re: Merge log and natural history

On Tue, Jul 8, 2014 at 9:03 PM, Gavin Lambert <colnet_at_mirality.co.nz> wrote:
> On Jul 9 2014, quoth Ben Fritz:
>> It's not exactly what you're looking for, but sometimes (I sometimes
>> don't see it when I'd expect to) there is a "Hide unmergeable
>> revisions" checkbox on the log dialog. Clicking this does not gray out
>> the revisions you're asking for; instead it hides them entirely. Same
>> use-case, different method.
>
> In my testing, the natural history revisions are not hidden. With that checkbox ticked and "stop on copy" unticked, I can still see all the way back to revision 1. It's probably just hiding the greyed out revisions only, so the same underlying problem is affecting both.
>

No, they actually get hidden if they come before the branch as well.
Or at least, they did in 1.8.5:

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

I cannot actually find this button anymore when I try to merge from
trunk to any of my branches. I have no idea where it went or why it is
missing. Regardless, I can't test anymore to verify whether the
feature still works or not.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-07-09 16:58:25 CEST