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

Bug

From: Igor Maliavko <i_maliavko_at_wargaming.net>
Date: Tue, 26 Jan 2016 10:20:54 +0000

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.

_____________________________________
Igor Maliavko
UI back-end team lead

[wargaming.net]
EgzO3mXGcK

This e-mail may contain CONFIDENTIAL AND PROPRIETARY INFORMATION and/or PRIVILEGED AND CONFIDENTIAL COMMUNICATION intended solely for the recipient and, therefore, may not be retransmitted to any party outside of the recipient's organization without the prior written consent of the sender. If you have received this e-mail in error please notify the sender immediately by telephone or reply e-mail and destroy the original message without making a copy. Wargaming.net accepts no liability for any losses or damages resulting from infected e-mail transmissions and viruses in e-mail attachment. kgzO3mXGcg
Received on 2016-01-26 11:47:39 CET

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