Revert "Clones.bjs"

[gitlive] / Clones.js

diff --git a/Clones.js b/Clones.js
index 4023d80..6f64404 100644 (file)
--- a/Clones.js
+++ b/Clones.js
@@ -383,9 +383,16 @@ Clones=new XObject({
                                             var cb = tr[i].currentBranch;
                                             //print(JSON.stringify(cb,null,4));
                                             var col = '#ffffff';
-                                            if ((cb.lastrev != cb.remoterev)  || tr[i].hasLocalChanges) {
+                                            if (cb.lastrev != cb.remoterev) {
                                                 col =  '#ff0000';
                                             }
+                                            if (tr[i].hasLocalChanges) {
+                                                col =  '#0000ff';
+                                            }
+                                            if  ((cb.lastrev != cb.remoterev) && (tr[i].hasLocalChanges)) {
+                                                col =  '#ff00ff';
+                                            }
+                                            
                                             this.el.set_value(ret.iter, 7, col  );      
                                             
                                         }