Fixed edge case where local/remote wiki is deleted and re-added, caus…

…ing the synced version to be higher than actual version. Such cases will be marked as conflict.
ivanchoo · Apr 18, 2012 · 2c27480 · 2c27480
1 parent 1ca27e6
commit 2c27480
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/wikisync/model.py b/wikisync/model.py
@@ -62,6 +62,11 @@ def replace(self, *args, **kwargs):
                 status = "modified"
             elif rv == srv and lv == slv:
                 status = "synced"
+            elif rv < srv or lv < slv:
+                # edge case, local wiki or remote wiki was deleted
+                # and re-added, causing the synced version to be higher
+                # we mark the status as conflict and prompt user to resolve it
+                status = "conflict"
         return o.status == status and o or o._replace(status=status)
 
     def validate(self):