Commit d02f2044 authored by Christophe Dumez's avatar Christophe Dumez

- added support for replaced/conflicted files


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6641 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e06d06b6
...@@ -804,10 +804,12 @@ class SubversionTool(UniqueObject, Folder): ...@@ -804,10 +804,12 @@ class SubversionTool(UniqueObject, Folder):
itemStatus = item.msg_status itemStatus = item.msg_status
if itemStatus == 'added' : if itemStatus == 'added' :
itemColor='green' itemColor='green'
elif itemStatus == 'modified' : elif itemStatus == 'modified' or itemStatus == 'replaced' :
itemColor='orange' itemColor='orange'
elif itemStatus == 'deleted' : elif itemStatus == 'deleted' :
itemColor='red' itemColor='red'
elif itemStatus == 'conflicted' :
itemColor='grey'
else : else :
itemColor='black' itemColor='black'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment