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

Patrick Steinhardt <[email protected]> Mon, 20 Mar 2017 12:51:19 +0100

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

Seems as if the first message from my work account didn't get
through to the ML. Re-sending from my personal account as it
should be known already.
--

Hi,

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.

The attached patch fixes the issue.

Regards
Patrick
-- 
Patrick Steinhardt, Entwickler

elego Software Solutions GmbH, http://www.elego.de
Gebäude 12 (BIG), Gustav-Meyer-Allee 25, 13355 Berlin, Germany

Sitz der Gesellschaft: Berlin, USt-IdNr.: DE 163214194
Handelsregister: Amtsgericht Charlottenburg HRB 77719
Geschäftsführer: Olaf Wagner

SVNDiff.cpp.patch (text/x-diff, 710 B)

Index: SVNDiff.cpp
===================================================================
--- SVNDiff.cpp	(revision 27746)
+++ SVNDiff.cpp	(working copy)
@@ -151,7 +151,7 @@
     {
         // Hasn't changed locally - diff remote against WC
         return CAppUtils::StartExtDiff(
-            filePath, remotePath, n1, n3, filePath, filePath, SVNRev::REV_WC, remoteRev, remoteRev, CAppUtils::DiffFlags().AlternativeTool(m_bAlternativeTool),
+            remotePath, filePath, n3, n1, filePath, filePath, SVNRev::REV_WC, remoteRev, remoteRev, CAppUtils::DiffFlags().AlternativeTool(m_bAlternativeTool),
             m_JumpLine, filePath.GetFileOrDirectoryName(), L"");
     }
     else if (remotePath.IsEmpty())

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