Login | Register
My pages Projects Community openCollabNet

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

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

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

Author steveking
Full name Stefan Küng
Date 2017-03-20 12:37:36 PDT
Message 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

« Previous message in topic | 2 of 3 | Next message in topic »

Messages

Show all messages in topic

[RESEND][PATCH] Fix diffing unmodified against modified remote file Patrick Steinhardt <ps at pks dot im> Patrick Steinhardt <ps at pks dot im> 2017-03-20 04:50:40 PDT
     Re: [RESEND][PATCH] Fix diffing unmodified against modified remote file steveking Stefan Küng 2017-03-20 12:37:36 PDT
         Re: [RESEND][PATCH] Fix diffing unmodified against modified remote file Patrick Steinhardt <ps at pks dot im> Patrick Steinhardt <ps at pks dot im> 2017-03-21 00:38:32 PDT
Messages per page: