• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision13563 (tree)
Zeit2008-07-26 16:47:57
Autorstefankueng

Log Message

Fix the merge of r13551.

Ändern Zusammenfassung

Diff

--- tags/version-1.5.1/src/TortoiseShell/ContextMenu.cpp (revision 13562)
+++ tags/version-1.5.1/src/TortoiseShell/ContextMenu.cpp (revision 13563)
@@ -475,15 +475,15 @@
475475 itemStates |= ITEMIS_NEEDSLOCK;
476476 }
477477 if ((status != svn_wc_status_unversioned)&&(status != svn_wc_status_ignored)&&(status != svn_wc_status_none))
478- itemStatesFolder |= ITEMIS_INSVN;
478+ itemStates |= ITEMIS_INSVN;
479479 if (status == svn_wc_status_normal)
480- itemStatesFolder |= ITEMIS_NORMAL;
480+ itemStates |= ITEMIS_NORMAL;
481481 if (status == svn_wc_status_conflicted)
482- itemStatesFolder |= ITEMIS_CONFLICTED;
482+ itemStates |= ITEMIS_CONFLICTED;
483483 if (status == svn_wc_status_added)
484- itemStatesFolder |= ITEMIS_ADDED;
484+ itemStates |= ITEMIS_ADDED;
485485 if (status == svn_wc_status_deleted)
486- itemStatesFolder |= ITEMIS_DELETED;
486+ itemStates |= ITEMIS_DELETED;
487487 }
488488 else
489489 {
Show on old repository browser