• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28288 (tree)
Time2018-07-13 23:32:52
Authorstefankueng

Log Message

Merged revision(s) r28286, r28287 from trunk:
* Don't cast the revision object to a number when swapping the two revisions.
* Only swap the revisions if they're numbers or HEAD.

Change Summary

Incremental Difference

--- branches/1.10.x/src/Changelog.txt (revision 28287)
+++ branches/1.10.x/src/Changelog.txt (revision 28288)
@@ -25,6 +25,8 @@
2525 - BUG: Changing update depths of sparse checkouts
2626 failed when trying to add files in excluded
2727 folders. (Stefan)
28+- BUG: Exception was shown when trying to show the
29+ log between a date and a number revision. (Stefan)
2830
2931 Version 1.10.0
3032 See the release notes here:
--- branches/1.10.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28287)
+++ branches/1.10.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28288)
@@ -1170,13 +1170,12 @@
11701170 return;
11711171 m_endrev = dlg.GetEndRevision();
11721172 m_startrev = dlg.GetStartRevision();
1173- if (((m_endrev.IsNumber())&&(m_startrev.IsNumber()))||
1174- (m_endrev.IsHead()||m_startrev.IsHead()))
1173+ if ((m_endrev.IsNumber() || m_endrev.IsHead()) && (m_startrev.IsNumber() || m_startrev.IsHead()))
11751174 {
1176- if (((LONG)m_startrev < (LONG)m_endrev)||
1175+ if (((svn_revnum_t)m_startrev < (svn_revnum_t)m_endrev)||
11771176 (m_endrev.IsHead()))
11781177 {
1179- svn_revnum_t temp = m_startrev;
1178+ auto temp = m_startrev;
11801179 m_startrev = m_endrev;
11811180 m_endrev = temp;
11821181 }
Show on old repository browser