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

Patrick Steinhardt <[email protected]> Tue, 21 Mar 2017 08:39:09 +0100

Newsgroups	gmane.comp.version-control.subversion.tortoisesvn.devel
Message-ID	<20170321073909.GA475@pks-xps>

On Mon, Mar 20, 2017 at 08:37:41PM +0100, Stefan Küng wrote:
> 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

Okay, this still leaves the issue that the remote side is
editable while the locale file is read-only. Furthermore, saving
changes to the modified remote file will prompt you to save the
file at the remote file's temporary location. I guess we can
agree that at least this behavior is wrong?

If so, what's your proposed fix to this? Keep the sides as-is but
toggle which of both sides is actually read-only and which is
not?

Regards
Patrick

signature.asc (application/pgp-signature, 833 B)