[Pkg-bazaar-commits] ./bzr-builddeb/trunk.old r240: Fix starting an upstream branch from another.
James Westby
jw+debian at jameswestby.net
Wed Dec 10 08:32:49 UTC 2008
------------------------------------------------------------
revno: 240
committer: James Westby <jw+debian at jameswestby.net>
branch nick: read-only-import
timestamp: Fri 2008-07-11 22:58:43 +0100
message:
Fix starting an upstream branch from another.
This problem was caused by making .upstream_tree optional.
modified:
import_dsc.py
tests/test_import_dsc.py
-------------- next part --------------
=== modified file 'import_dsc.py'
--- a/import_dsc.py 2008-07-11 18:46:32 +0000
+++ b/import_dsc.py 2008-07-11 21:58:43 +0000
@@ -1610,7 +1610,7 @@
pull_revid = branch.revid_of_upstream_version(pull_version)
mutter("Initialising upstream from %s, version %s" \
% (str(branch), str(pull_version)))
- up_pull_branch = branch.upstream_tree.branch
+ up_pull_branch = branch.upstream_branch
self.upstream_tree.pull(up_pull_branch,
stop_revision=pull_revid)
=== modified file 'tests/test_import_dsc.py'
--- a/tests/test_import_dsc.py 2008-07-11 18:37:06 +0000
+++ b/tests/test_import_dsc.py 2008-07-11 21:58:43 +0000
@@ -2051,14 +2051,12 @@
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()
+ self.db1.import_package(builder.dsc_name())
+ self.db1.upstream_tree = None
builder.new_version(version2)
- builder.add_default_control()
builder.build()
self.db2.import_package(builder.dsc_name())
self.assertEqual(len(self.up_tree2.branch.revision_history()), 2)
More information about the Pkg-bazaar-commits
mailing list