[Pkg-bazaar-commits] ./bzr-builddeb/trunk.old r246: Fix bad merge that caused a test to fail.

[James Westby]

------------------------------------------------------------
revno: 246
committer: James Westby <jw+debian at jameswestby.net>
branch nick: 2.0
timestamp: Wed 2008-07-30 16:10:40 +0100
message:
  Fix bad merge that caused a test to fail.
modified:
  tests/test_import_dsc.py
-------------- next part --------------
=== modified file 'tests/test_import_dsc.py'
--- a/tests/test_import_dsc.py	2008-07-30 14:06:21 +0000
+++ b/tests/test_import_dsc.py	2008-07-30 15:10:40 +0000
@@ -2052,11 +2052,6 @@
     def test_import_package_init_from_other(self):
         version1 = Version("0.1-1")
         version2 = Version("0.2-1")
-        up_revid1 = self.up_tree1.commit("upstream one")
-        self.db1.tag_upstream_version(version1)
-        self.tree1.pull(self.up_tree1.branch)
-        revid1 = self.tree1.commit("one")
-        self.db1.tag_version(version1)
         builder = SourcePackageBuilder("package", version1)
         builder.add_default_control()
         builder.build()