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

Re: Bug

From: Stefan Hett <stefan_at_egosoft.com>
Date: Tue, 26 Jan 2016 13:01:43 +0100

Hi Igor,
>
> Hi all.
>
> There is a bug in the “Show Log” window, called from merge dialog.
> Steps to reproduce:
>
> 1. create branch from specific revision A (not HEAD, HEAD – 5
> revisions for example); after branch will created we have its creation
> revision B;
>
> 2. check out branch has just been created;
>
> 3. then trying to sync our branch to HEAD; call merge dialog to the
> checked out folder: right mouse button-> TortoiseSVN -> Merge;
>
> 4. select “Merge a range of revision” -> “Show Log” button;
>
> Result:
>
> There are no revisions to select for merging in the dialog, but it is
> not right, we have (B – A) revisions to merge. Moreover, if we
> unselect checkbox “Stop on copy/rename”, we will see that all revision
> below revision B are marked as gray (already merged), even whose which
> not merged yet.
>
> Expected result:
>
> Revisions between B and A (revision of branch creation and revision
> branch was created from) can be visible in the “Show Log” dialog
> without dropping “Stop on copy/rename” checkbox and marked as normal
> font color (unmerged revisions).
>
> Thanks.
>
I take it you wanted to send this one to the tortoiseSVN mailing list
instead?

-- 
Regards,
Stefan Hett
Received on 2016-01-26 13:01:53 CET

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