Changeset 1049 in tailor

Timestamp:

12/27/05 14:48:34 (7 years ago)

Author:

lele@…

Hash name:

20051227134834-7a6fb-0c1213bff7d78f3a2dd872143faee3bc7aa55105

Message:

Do not add entries inside a moved/copied directory on bzr target
The fix to #24 and indirectly #23 triggered (actually, the test did) a
similar issue solved for Subversion with [840] and [841]. This patch
applies a similar solution for BazaarNG, to prevent addition within a
renamed/copied directory. Specifically, this may happen for example
in a changeset coming from Svn that

1. copies a directory
2. replaces (a Subversion "R" event) an item in the target with something else

File:

• vcpx/bzr.py (modified) (1 diff)

vcpx/bzr.py

@@ -137 +137 @@
             added = ([new[0] for new in diff.added] +
                      [renamed[1] for renamed in diff.renamed])
+
+            def parent_was_copied(n):
+                for p in added:
+                    if n.startswith(p+'/'):
+                        return True
+                return False
+
             for e in entries:
-                if not inv.has_filename(e) and not e in added:
-                    new_entries.extend([e])
+                if (not inv.has_filename(e)
+                    and not e in added
+                    and not parent_was_copied(e)):
+                    new_entries.append(e)
                 else:
                     self.log.debug('"%s" already in inventory, skipping', e)