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

RE: Re: Bug report: "Compare with HEAD and BASE" switches args %base and %mine

From: walter klust <wklust_at_elego.de>
Date: Tue, 20 Dec 2016 06:48:05 -0800 (PST)

> On 02.03.2016 17:39, walter klust wrote:
> > How to reproduce:
> >
> > - Have a working copy with a file which is not current. - Call "Check
> > for modification" on parent directory - Click "Check repository", the
> > non-current file should be shown in the list - Right click on the
> > non-current file, select "Compare with HEAD and BASE" - a compare
> > window is shown. Two files are shown, one form the working copy and
> > one from the repository, but the positions are wrong. The working
> > copy file is on the left and the repo file on the right; they should
> > be switched: The repo file is editable and the wc file not; it should
> > be the other way.
>
> The diff is always shown with the newer file on the right. So it's
> correctly shown. If you want to edit the left, first click in the left
> view, then click the "Enable Edit" button in the ribbon.

This is not the case if you swap the parameters %base and %mine in the TSVN DiffViewer External Configuration. In this case the newer file will be shown to the left.

>
> > The same compare dialog is used for "Diff with previous version" but
> > here the positions are correct.
>
> Here the diff is done to an older version, so again the newer file is
> shown on the right.
>
> 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=3197954

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-12-20 15:48:10 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.