[Erp5-report] r6641 - /erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Apr 14 13:39:18 CEST 2006


Author: chris
Date: Fri Apr 14 13:39:16 2006
New Revision: 6641

URL: http://svn.erp5.org?rev=6641&view=rev
Log:
- added support for replaced/conflicted files

Modified:
    erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=6641&r1=6640&r2=6641&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Fri Apr 14 13:39:16 2006
@@ -804,10 +804,12 @@
     itemStatus = item.msg_status
     if itemStatus == 'added' :
       itemColor='green'
-    elif itemStatus == 'modified' :
+    elif itemStatus == 'modified' or  itemStatus == 'replaced' :
       itemColor='orange'
     elif itemStatus == 'deleted' :
       itemColor='red'
+    elif itemStatus == 'conflicted' :
+      itemColor='grey'
     else :
       itemColor='black'
       




More information about the Erp5-report mailing list