[Pkg-bazaar-commits] ./bzr-builddeb/trunk r343: Also use the upstream revision to get file ids from.

[James Westby]

------------------------------------------------------------
revno: 343
committer: James Westby <james.westby at canonical.com>
branch nick: trunk
timestamp: Sat 2009-07-04 16:30:40 -0400
message:
  Also use the upstream revision to get file ids from.
modified:
  import_dsc.py
-------------- next part --------------
=== modified file 'import_dsc.py'
--- a/import_dsc.py	2009-07-04 19:18:43 +0000
+++ b/import_dsc.py	2009-07-04 20:30:40 +0000
@@ -1132,8 +1132,6 @@
             return br.repository.revision_tree(br.last_revision())
         upstream_trees = [get_last_revision_tree(o.upstream_branch)
             for o in other_branches]
-        import_dir(self.upstream_tree, upstream_part,
-                file_ids_from=upstream_trees + [self.tree])
         if upstream_branch is not None:
             if upstream_revision is None:
                 upstream_revision = upstream_branch.last_revision()
@@ -1141,6 +1139,11 @@
                     last_revision=upstream_revision)
             upstream_branch.tags.merge_to(self.upstream_branch.tags)
             upstream_parents.append(upstream_revision)
+            upstream_trees.insert(0,
+                    self.upstream_branch.repository.revision_tree(
+                        upstream_revision))
+        import_dir(self.upstream_tree, upstream_part,
+                file_ids_from=upstream_trees + [self.tree])
         self.upstream_tree.set_parent_ids(upstream_parents)
         revprops = {"deb-md5": md5}
         if upstream_tarball is not None: