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

Re: [RESEND][PATCH] Fix diffing unmodified against modified remote file

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 20 Mar 2017 20:37:41 +0100

On 20.03.2017 12:51, Patrick Steinhardt wrote:

> When having an unmodified but out-of-date local file which is to
> be diffed with an updated remote file (via "Check for
> modifications" -> "Check repository" -> "Compare with HEAD and
> BASE"), the resulting diff window is confusing the local and
> remote files. The left side will display the read-only local file
> while the right side will display the writable remote file, which
> is obviously wrong.

Not really, no: the right side of the diff should always show the newest
part of a two-way diff, and the left side the older one.
And it shows that diff correct under that assumption.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3221593
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-03-20 20:37:46 CET

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

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