• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision16125 (tree)
Zeit2009-04-10 01:02:54
Autorstefankueng

Log Message

Merge r16124 from trunk:
* Compare against the escaped url.

Ändern Zusammenfassung

Diff

--- branches/1.6.x/Languages/Tortoise_ca_ES.po (revision 16124)
+++ branches/1.6.x/Languages/Tortoise_ca_ES.po (revision 16125)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_ca_ES.po:r16124
--- branches/1.6.x/Languages/Tortoise_da.po (revision 16124)
+++ branches/1.6.x/Languages/Tortoise_da.po (revision 16125)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_da.po:r16124
--- branches/1.6.x/Languages/Tortoise_es.po (revision 16124)
+++ branches/1.6.x/Languages/Tortoise_es.po (revision 16125)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_es.po:r16124
--- branches/1.6.x/Languages/Tortoise_it.po (revision 16124)
+++ branches/1.6.x/Languages/Tortoise_it.po (revision 16125)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_it.po:r16124
--- branches/1.6.x/Languages/Tortoise_nb.po (revision 16124)
+++ branches/1.6.x/Languages/Tortoise_nb.po (revision 16125)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_nb.po:r16124
--- branches/1.6.x/Languages/Tortoise_pt_PT.po (revision 16124)
+++ branches/1.6.x/Languages/Tortoise_pt_PT.po (revision 16125)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_pt_PT.po:r16124
--- branches/1.6.x/Languages/Tortoise_ru.po (revision 16124)
+++ branches/1.6.x/Languages/Tortoise_ru.po (revision 16125)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_ru.po:r16124
--- branches/1.6.x/Languages/Tortoise_sv.po (revision 16124)
+++ branches/1.6.x/Languages/Tortoise_sv.po (revision 16125)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_sv.po:r16124
--- branches/1.6.x/src/Changelog.txt (revision 16124)
+++ branches/1.6.x/src/Changelog.txt (revision 16125)
@@ -29,6 +29,8 @@
2929 - BUG: The SubWCRevCOM didn't return date information. (Stefan)
3030 - BUG: Refreshing a folder in the repository lead to duplicate entries
3131 shown in the tree view. (Stefan)
32+- BUG: Already merged revisions were not indicated if the url required
33+ escaping. (Stefan)
3234
3335 Version 1.6.0
3436 - NEW: Ignoring of multiple selected items by their extension. See
--- branches/1.6.x/src/TortoiseProc/LogDlg.cpp (revision 16124)
+++ branches/1.6.x/src/TortoiseProc/LogDlg.cpp (revision 16125)
@@ -1113,10 +1113,12 @@
11131113
11141114 if (mergeinfo)
11151115 {
1116+ CStringA sUrl = CPathUtils::PathEscape(CUnicodeUtils::GetUTF8(m_sURL));
1117+
11161118 for (hi = apr_hash_first(localpool, mergeinfo); hi; hi = apr_hash_next(hi))
11171119 {
11181120 apr_hash_this(hi, &key, NULL, &val);
1119- if (m_sURL.Compare(CUnicodeUtils::GetUnicode((char*)key)) == 0)
1121+ if (sUrl.Compare((char*)key) == 0)
11201122 {
11211123 apr_array_header_t * arr = (apr_array_header_t*)val;
11221124 if (val)
Show on old repository browser