bzr-builddeb

Merge lp:~vila/bzr-builddeb/trunk into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

  1. trunk
  2. Merge into trunk-old
Proposed by Vincent Ladeuil
Status: Merged
Merge reported by: James Westby
Merged at revision: not available
Proposed branch: lp:~vila/bzr-builddeb/trunk
Merge into: lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old
Diff against target: None lines
To merge this branch: bzr merge lp:~vila/bzr-builddeb/trunk
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+8691@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

Same player shoots again, some more uses for PristineTarFeature :)

Revision history for this message
James Westby (james-w) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test_import_dsc.py'
2--- tests/test_import_dsc.py 2009-07-04 20:45:01 +0000
3+++ tests/test_import_dsc.py 2009-07-10 17:43:12 +0000
4@@ -826,6 +826,7 @@
5 self.assertEqual(len(self.tree2.branch.revision_history()), 3)
6
7 def test_import_package_init_upstream_from_other(self):
8+ self.requireFeature(PristineTarFeature)
9 version1 = Version("0.1-1")
10 version2 = Version("0.1-2")
11 builder = SourcePackageBuilder("package", version1)
12@@ -1358,6 +1359,7 @@
13 # are used in the second non-native upstream
14
15 def test_merge_upstream_branches(self):
16+ self.requireFeature(PristineTarFeature)
17 version1 = Version("1.0-1")
18 version2 = Version("1.1-1")
19 version3 = Version("1.2-1")
20@@ -1395,6 +1397,7 @@
21
22 def test_import_symlink(self):
23 version = Version("1.0-1")
24+ self.requireFeature(PristineTarFeature)
25 self.requireFeature(tests.SymlinkFeature)
26 builder = SourcePackageBuilder("package", version)
27 builder.add_default_control()

Subscribers

People subscribed via source and target branches