Changeset 1222 in tailor for vcpx/repository/darcs/source.py

Timestamp:

07/10/06 01:43:05 (7 years ago)

Author:

lele@…

Hash name:

20060709234305-97f81-5e42989c3be7ed6d12b6f56252fcb8c8fdb724a9

Message:

Fix the reordering of bad ordered darcs hunks

File:

• vcpx/repository/darcs/source.py (modified) (1 diff)

vcpx/repository/darcs/source.py

@@ -137 +137 @@
                         if e.action_kind == e.RENAMED:
                             for j,n in enumerate(entries[i+1:]):
-                                if (e.name.startswith(n.name+'/') and
-                                    (n.action_kind == n.ADDED or
-                                     n.action_kind == n.RENAMED)):
+                                if ((e.name.startswith(n.name+'/') or e.old_name==n.name) and
+                                    (n.action_kind == n.ADDED or n.action_kind == n.RENAMED)):
                                     m = entries.pop(i+1+j)
                                     entries.insert(i, m)