\r
CDiffData::CDiffData(void)\r
{\r
- apr_initialize();\r
- svn_dso_initialize();\r
- g_SVNAdminDir.Init();\r
+// apr_initialize();\r
+// svn_dso_initialize();\r
+// g_SVNAdminDir.Init();\r
\r
m_bBlame = false;\r
\r
\r
CDiffData::~CDiffData(void)\r
{\r
- g_SVNAdminDir.Close();\r
- apr_terminate();\r
+//// g_SVNAdminDir.Close();\r
+// apr_terminate();\r
}\r
\r
int CDiffData::GetLineCount()\r
\r
BOOL CDiffData::Load()\r
{\r
+#if 0\r
CString sConvertedBaseFilename, sConvertedTheirFilename, sConvertedYourFilename;\r
apr_pool_t * pool;\r
\r
}\r
\r
apr_pool_destroy (pool); // free the allocated memory\r
+\r
+#endif\r
return TRUE;\r
}\r
\r
\r
bool\r
-CDiffData::DoTwoWayDiff(const CString& sBaseFilename, const CString& sYourFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, apr_pool_t * pool)\r
+CDiffData::DoTwoWayDiff(const CString& sBaseFilename, const CString& sYourFilename, DWORD dwIgnoreWS, bool bIgnoreEOL)\r
{\r
// convert CString filenames (UTF-16 or ANSI) to UTF-8\r
CStringA sBaseFilenameUtf8 = CUnicodeUtils::GetUTF8(sBaseFilename);\r
CStringA sYourFilenameUtf8 = CUnicodeUtils::GetUTF8(sYourFilename);\r
\r
+#if 0\r
svn_diff_t * diffYourBase = NULL;\r
svn_error_t * svnerr = NULL;\r
svn_diff_file_options_t * options = svn_diff_file_options_create(pool);\r
tempdiff = tempdiff->next;\r
}\r
TRACE(_T("done with 2-way diff\n"));\r
-\r
+#endif\r
return true;\r
}\r
\r
bool\r
-CDiffData::DoThreeWayDiff(const CString& sBaseFilename, const CString& sYourFilename, const CString& sTheirFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, bool bIgnoreCase, apr_pool_t * pool)\r
+CDiffData::DoThreeWayDiff(const CString& sBaseFilename, const CString& sYourFilename, const CString& sTheirFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, bool bIgnoreCase)\r
{\r
// convert CString filenames (UTF-16 or ANSI) to UTF-8\r
CStringA sBaseFilenameUtf8 = CUnicodeUtils::GetUTF8(sBaseFilename);\r
CStringA sYourFilenameUtf8 = CUnicodeUtils::GetUTF8(sYourFilename);\r
CStringA sTheirFilenameUtf8 = CUnicodeUtils::GetUTF8(sTheirFilename);\r
+#if 0\r
svn_diff_t * diffTheirYourBase = NULL;\r
svn_diff_file_options_t * options = svn_diff_file_options_create(pool);\r
options->ignore_eol_style = bIgnoreEOL;\r
}\r
ASSERT(m_Diff3.GetCount() == m_YourBaseBoth.GetCount());\r
ASSERT(m_TheirBaseBoth.GetCount() == m_YourBaseBoth.GetCount());\r
-\r
+#endif\r
TRACE(_T("done with 3-way diff\n"));\r
return true;\r
}\r