On 08.09.2015 14:18, Stefan Hett wrote:
> On 9/2/2015 4:36 PM, Stefan Hett wrote:
>> Hi,
>>> Steps to reproduce:
>>> 1. Right-click on a directory with a c/o of a branch -> TortoiseSVN
>>> -> Merge -> Next
>>> 2. in "URL to merge from" specify the URL the branch was created from
>>> 3. Click on "Show log" (in the Revision range to merge section)
>>> 4. In the log dialog ensure "Stop on copy/rename" is selected
>>>
>>> Actual result:
>>> The log dialog also reports revisions before the branch was created.
>>>
>>> Expected result:
>>> Only revisions after the branch was created are displayed.
>>>
>>> See the following screenshots.
>>>
>>> In this case I'm trying to merge changes from XRebirth/branches/XR
>>> back into XRebirth/branches/XR_VS2015. As seen here, the XR_VS2015
>>> branch was created from XRebirth/branches/XR at revision 198907:
>>> [...]
>>>
>>> However the log dialog still shows revisions < 198907.
>>> [...]
>>>
>>> I think this was different in TSVN 1.8 (but might remember wrong). If
>>> I do remember wrong, then see this report as a feature request,
>>> because I'd find it highly useful to have means available to see
>>> which revisions are implicitly already integrated in the branch/cpy,
>>> and therefore do not need to be cherry-picked.
>> Any word/idea on this one?
>>
> Sorry I'm replying here on the wrong leaf of the thread (forgot to
> register to the mailing list).
>
> I just tried to enable the setting mentioned in the other thread
> (LogFindCopyFrom) but it didn't make a difference to me. Already merged
> revisions from the original branch are correctly grayed out, but the log
> still displays the revisions before the branch was created as
> mergable/non-grayed-out.
>
> This was tested using TSVN 1.9.1.
> I also tried clearing the TSVN cache before doing the test (without
> making any difference).
> Am I doing something wrong here?
You have to check the box "hide non-mergeable revisions" as well. If
that box is not checked, then the revisions before the branch are shown
as well.
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=3136478
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-09-08 19:48:45 CEST