Index: vcpx/repository/hg.py
===================================================================
--- vcpx/repository/hg.py	(revision 1220)
+++ vcpx/repository/hg.py	(revision 1274)
@@ -114,7 +114,8 @@
             # cause a merge error on update. If no files are modified,
             # added, removed, or deleted, do update -C
-            modified = [x for x in repo.changes()[0:4] if x]
-            if modified:
-                return modified
+            modified, added, removed, deleted = repo.changes()[0:4]
+            conflicting = modified + added + removed + deleted
+            if conflicting:
+                return conflicting
             return repo.update(node, force=True)