Changeset 1274 in tailor for vcpx/repository/hg.py

Timestamp:

09/09/06 21:42:58 (7 years ago)

Author:

lele@…

Hash name:

20060909194258-7a6fb-b3908d4add76b8477c5e799c72c54a960134dd5f

Message:

Fix the conflict case with HG
Do not return a list of tuples from _applyChangeset(), but rather a flat list.

File:

• vcpx/repository/hg.py (modified) (1 diff)

vcpx/repository/hg.py

@@ -114 +114 @@
             # 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)