A related post yesterday, reminded me to look into this. Following the
build.txt instructions:
- http://users.skynet.be/sbi/libxml-python/ seems to be broken.
- I downloaded libxml2_python-2.9.3-cp27-none-win_amd64.whl from
https://www.lfd.uci.edu/~gohlke/pythonlibs/#libxml-python.
- I already had python2.7 installed. Running pip install
libxml2_python-2.9.3-cp27-none-win_amd64.whl didn't work.
- pip also warned about being an old version, so I upgraded it. It then
still complained about python 2.7 being past end-of-life.
Are there more up-to-date instructions?
Is there another list for developers of TortoiseSVN?
Since I only want to alter the double-click handler in TortoiseProc, are
there more specific instructions for just building that?
I have attached an untested patch file. From what I can see, CompareWithWC
only does an extract, it doesn't need to download from the server. Note -
there is a warning in the previous merge handling section to do with the
window handle, which may also apply to work copy diff.
Is there anyone who can build TortoiseProc, who would be willing to make
the change for me for a fee?
On Wednesday, 26 August 2020 at 02:11:03 UTC+10 Stefan wrote:
> there's a file named build.txt in the source root of TSVN...
--
You received this message because you are subscribed to the Google Groups
"TortoiseSVN" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/tortoisesvn/c2f2c036-dffe-4b19-ae02-000ba91f45afn%40googlegroups.com.
Index: src/TortoiseProc/SVNProgressDlg.cpp
===================================================================
--- src/TortoiseProc/SVNProgressDlg.cpp (revision 29091)
+++ src/TortoiseProc/SVNProgressDlg.cpp (working copy)
@@ -1931,6 +1931,10 @@
svn_revnum_t baseRev = 0;
diff.DiffFileAgainstBase(data->path, baseRev, false);
}
+ else if (data->action == svn_wc_notify_update_update)
+ {
+ CompareWithWC(data);
+ }
else if ((!data->bAuxItem)&&(data->path.Exists())&&(!data->path.IsDirectory()))
{
bool bOpenWith = false;
@@ -4332,7 +4336,7 @@
history.Save();
}
-void CSVNProgressDlg::CompareWithWC( NotificationData * data )
+void CSVNProgressDlg::CompareWithWC( const NotificationData * data )
{
if (data == nullptr)
return;
Index: src/TortoiseProc/SVNProgressDlg.h
===================================================================
--- src/TortoiseProc/SVNProgressDlg.h (revision 29091)
+++ src/TortoiseProc/SVNProgressDlg.h (working copy)
@@ -288,7 +288,7 @@
void MergeAfterCommit();
void GenerateMergeLogMessage();
bool IsRevisionRelatedToMerge(const CDictionaryBasedTempPath& basePath, PLOGENTRYDATA pLogItem);
- void CompareWithWC(NotificationData * data);
+ void CompareWithWC(const NotificationData * data);
CTSVNPathList GetPathsForUpdateHook(const CTSVNPathList& pathList);
void ResolvePostOperationConflicts();
