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?
Also I don't fully get ur statement about "[...] a new svn API was
available to get the merged rev info.[...]". Are u suggesting you are
making use of the new SVN API which would the make that old
LogFindCopyFrom setting obsolete and therefore it seems like there's
some bug in SVN with that API? Or are you suggesting that the new API is
available but there's nothing in TSVN's front end for the user to set a
newly available parameter for that SVN API (yet)? Or did I simply
overlook some new GUI setting?
--
Regards,
Stefan Hett
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3136408
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-09-08 14:18:23 CEST