• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision5416 (tree)
Zeit2006-01-15 17:58:31
Autorstefankueng

Log Message

Merge revisions 5408, 5409, 5410 and 5414 from trunk.

Ändern Zusammenfassung

Diff

--- branches/1.3.x/STATUS.txt (revision 5415)
+++ branches/1.3.x/STATUS.txt (revision 5416)
@@ -23,7 +23,7 @@
2323 5350 : Use midnight as the default time in the log filter
2424 5351 : Use full filename to load crashreport dll
2525 5358 : fix broken sorting in log dialog
26-5361, 5364, 5367, 5389-5392 : patch neon from the build script
26+5361, 5364, 5367, 5389-5392, 5414: patch neon from the build script
2727 5375 : critical sections to avoid crash when drive is unmounted (cache)
2828 5376 : OK button read "Cancel" instead of "OK" in log dialog started for selection
2929 5374, 5381 : doc change, copyright
@@ -33,5 +33,9 @@
3333 5403 : Fix bug with "Others (#)" for "by date" statistics
3434 5404 : Wrong crawling of ignored files (treated them as folders)
3535 5405 : Fix creating patchfile for multiple selected files
36+5408 : Broken diffing of UTF8 files
37+5409 : Create Patch included files two times if they were below a folder with
38+ property changes
39+5410 : Foldernames like "folder.svn" were treated as admin dirs
3640
3741
--- branches/1.3.x/src/Changelog.txt (revision 5415)
+++ branches/1.3.x/src/Changelog.txt (revision 5416)
@@ -84,6 +84,9 @@
8484 exist anymore in HEAD. (Stefan)
8585 - BUG: A malformed URL could make TortoiseSVN crash, for example
8686 httpS://test/test. (Stefan)
87+- BUG: Create Patch would include the diffs of a file two times if
88+ the file was below a folder with property changes and
89+ the folder was selected too. (Stefan)
8790
8891 Version 1.2.6
8992 - BUG: The status cache updated sometimes wrong paths or missed
--- branches/1.3.x/src/SVN/SVNAdminDir.cpp (revision 5415)
+++ branches/1.3.x/src/SVN/SVNAdminDir.cpp (revision 5416)
@@ -92,11 +92,13 @@
9292 {
9393 if (ind == (path.GetLength() - 4))
9494 {
95- bIsAdminDir = true;
95+ if ((ind == 0)||(path.GetAt(ind-1) == '\\'))
96+ bIsAdminDir = true;
9697 }
9798 else if (path.Find(_T(".svn\\"))>=0)
9899 {
99- bIsAdminDir = true;
100+ if ((ind == 0)||(path.GetAt(ind-1) == '\\'))
101+ bIsAdminDir = true;
100102 }
101103 }
102104 if (!bIsAdminDir && m_bVSNETHack)
@@ -106,11 +108,13 @@
106108 {
107109 if (ind == (path.GetLength() - 4))
108110 {
109- bIsAdminDir = true;
111+ if ((ind == 0)||(path.GetAt(ind-1) == '\\'))
112+ bIsAdminDir = true;
110113 }
111114 else if (path.Find(_T("_svn\\"))>=0)
112115 {
113- bIsAdminDir = true;
116+ if ((ind == 0)||(path.GetAt(ind-1) == '\\'))
117+ bIsAdminDir = true;
114118 }
115119 }
116120 }
@@ -119,4 +123,3 @@
119123
120124
121125
122-
--- branches/1.3.x/src/SVN/TSVNPath.cpp (revision 5415)
+++ branches/1.3.x/src/SVN/TSVNPath.cpp (revision 5416)
@@ -998,6 +998,8 @@
998998 CTSVNPath testPath;
999999 testPath.SetFromUnknown(_T("c:\\.svndir"));
10001000 ATLASSERT(!testPath.IsAdminDir());
1001+ testPath.SetFromUnknown(_T("c:\\test.svn"));
1002+ ATLASSERT(!testPath.IsAdminDir());
10011003 testPath.SetFromUnknown(_T("c:\\.svn"));
10021004 ATLASSERT(testPath.IsAdminDir());
10031005 testPath.SetFromUnknown(_T("c:\\.svndir\\test"));
--- branches/1.3.x/src/TortoiseMerge/FileTextLines.cpp (revision 5415)
+++ branches/1.3.x/src/TortoiseMerge/FileTextLines.cpp (revision 5416)
@@ -399,7 +399,7 @@
399399 file.Write((LPCSTR)sLine, sLine.GetLength());
400400 } // for (int i=0; i<arPatchLines.GetCount(); i++)
401401 }
402- else if ((m_UnicodeType == CFileTextLines::UTF8BOM)||(m_UnicodeType == CFileTextLines::UTF8BOM))
402+ else if ((m_UnicodeType == CFileTextLines::UTF8BOM)||(m_UnicodeType == CFileTextLines::UTF8))
403403 {
404404 if (m_UnicodeType == CFileTextLines::UTF8BOM)
405405 {
--- branches/1.3.x/src/TortoiseProc/TortoiseProc.cpp (revision 5415)
+++ branches/1.3.x/src/TortoiseProc/TortoiseProc.cpp (revision 5416)
@@ -1900,7 +1900,7 @@
19001900 CString sRelativePath = path[fileindex].GetWinPathString().Mid(sDir.GetDirectory().GetWinPathString().GetLength());
19011901 sRelativePath.Trim(_T("/\\"));
19021902 CTSVNPath diffpath = CTSVNPath(sRelativePath);
1903- if (!svn.Diff(diffpath, SVNRev::REV_BASE, diffpath, SVNRev::REV_WC, TRUE, FALSE, FALSE, FALSE, _T(""), true, tempPatchFilePath))
1903+ if (!svn.Diff(diffpath, SVNRev::REV_BASE, diffpath, SVNRev::REV_WC, FALSE, FALSE, FALSE, FALSE, _T(""), true, tempPatchFilePath))
19041904 {
19051905 progDlg.Stop();
19061906 ::MessageBox((EXPLORERHWND), svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
Show on old repository browser