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

Re: svn bug

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 26 Jan 2016 19:21:24 +0100

On 26.01.2016 13:31, Igor Maliavko wrote:
> 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;

Now first select the url to merge from. If you have never merged into a
wc before, the url shown in the merge dialog is the url of the working
copy - you can't merge into itself.

> 4. select “Merge a range of revision” -> “Show Log” button;

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=3157180
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-01-26 19:20:37 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.