• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision5377 (tree)
Zeit2006-01-09 22:55:51
Autorstefankueng

Log Message

Merge revisions 5374 to 5376 from trunk.

Ändern Zusammenfassung

Diff

--- branches/1.3.x/STATUS.txt (revision 5376)
+++ branches/1.3.x/STATUS.txt (revision 5377)
@@ -24,3 +24,6 @@
2424 5351 : Use full filename to load crashreport dll
2525 5358 : fix broken sorting in log dialog
2626 5361, 5364, 5367 : patch neon from the build script
27+5375 : critical sections to avoid crash when drive is unmounted (cache)
28+5376 : OK button read "Cancel" instead of "OK" in log dialog started for selection
29+5374 : doc change
\ No newline at end of file
--- branches/1.3.x/doc/source/en/TortoiseSVN/tsvn_server/server_apache.xml (revision 5376)
+++ branches/1.3.x/doc/source/en/TortoiseSVN/tsvn_server/server_apache.xml (revision 5377)
@@ -228,6 +228,7 @@
228228 <screen>
229229 &lt;Location /svn&gt;
230230 DAV svn
231+SVNListParentPath on
231232 SVNParentPath D:\SVN
232233 AuthType Basic
233234 AuthName "Subversion repositories"
@@ -319,6 +320,13 @@
319320 </entry>
320321 </row>
321322 <row>
323+ <entry>SVNListParentPath on</entry>
324+ <entry>
325+ For Subversion version 1.3 and higher, this directive enables
326+ listing all the available repositories under SVNParentPath.
327+ </entry>
328+ </row>
329+ <row>
322330 <entry>SVNParentPath D:\SVN</entry>
323331 <entry>
324332 tells Subversion to look for repositories below
@@ -476,6 +484,9 @@
476484 will need to install PHP on your server in order to use the
477485 below file).
478486 </para>
487+ <para>
488+ For Subversion 1.3 and higher, just enable <quote>SVNListParentPath on</quote>.
489+ </para>
479490 </tip>
480491 <sidebar>
481492 <programlisting role="PHP"><![CDATA[
--- branches/1.3.x/src/TSVNCache/DirectoryWatcher.cpp (revision 5376)
+++ branches/1.3.x/src/TSVNCache/DirectoryWatcher.cpp (revision 5377)
@@ -357,6 +357,7 @@
357357 {
358358 if (watchInfoMap.size()!=0)
359359 {
360+ AutoLocker lock(m_critSec);
360361 for (std::map<HANDLE, CDirWatchInfo *>::iterator I = watchInfoMap.begin(); I != watchInfoMap.end(); ++I)
361362 {
362363 CDirectoryWatcher::CDirWatchInfo * info = I->second;
@@ -371,6 +372,7 @@
371372 CTSVNPath path;
372373 if (watchInfoMap.size() == 0)
373374 return path;
375+ AutoLocker lock(m_critSec);
374376 for (std::map<HANDLE, CDirWatchInfo *>::iterator I = watchInfoMap.begin(); I != watchInfoMap.end(); ++I)
375377 {
376378 CDirectoryWatcher::CDirWatchInfo * info = I->second;
--- branches/1.3.x/src/TortoiseProc/LogDlg.cpp (revision 5376)
+++ branches/1.3.x/src/TortoiseProc/LogDlg.cpp (revision 5377)
@@ -577,8 +577,11 @@
577577 GetDlgItem(IDC_CHECK_STOPONCOPY)->EnableWindow(FALSE);
578578
579579 CString temp;
580- temp.LoadString(IDS_MSGBOX_CANCEL);
581- GetDlgItem(IDOK)->SetWindowText(temp);
580+ if (!GetDlgItem(IDOK)->IsWindowVisible())
581+ {
582+ temp.LoadString(IDS_MSGBOX_CANCEL);
583+ GetDlgItem(IDCANCEL)->SetWindowText(temp);
584+ }
582585 m_LogProgress.SetRange32(0, 100);
583586 m_LogProgress.SetPos(0);
584587 GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);
@@ -634,8 +637,11 @@
634637 m_LogList.SetRedraw(false);
635638 CUtils::ResizeAllListCtrlCols(&m_LogList);
636639 m_LogList.SetRedraw(true);
637- temp.LoadString(IDS_MSGBOX_OK);
638- GetDlgItem(IDOK)->SetWindowText(temp);
640+ if (!GetDlgItem(IDOK)->IsWindowVisible())
641+ {
642+ temp.LoadString(IDS_MSGBOX_OK);
643+ GetDlgItem(IDCANCEL)->SetWindowText(temp);
644+ }
639645 POINT pt;
640646 GetCursorPos(&pt);
641647 SetCursorPos(pt.x, pt.y);
Show on old repository browser