bzr-builddeb

Merge lp:~abentley/bzr-builddeb/fixed into lp:~lifeless/bzr-builddeb/2.0

  1. fixed
  2. Merge into 2.0
Proposed by Aaron Bentley
Status: Merged
Merged at revision: not available
Proposed branch: lp:~abentley/bzr-builddeb/fixed
Merge into: lp:~lifeless/bzr-builddeb/2.0
Diff against target: 15 lines (+2/-2)
1 file modified
cmds.py (+2/-2)
To merge this branch: bzr merge lp:~abentley/bzr-builddeb/fixed
Reviewer Review Type Date Requested Status
Robert Collins Pending
Review via email: mp+14815@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Aaron Bentley (abentley) wrote :

Please to be merging my fix.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmds.py'
2--- cmds.py 2009-11-11 06:22:42 +0000
3+++ cmds.py 2009-11-13 05:35:19 +0000
4@@ -729,9 +729,9 @@
5 raise BzrCommandError("Unable to find the tag for "
6 "the previous upstream version, %s, in the "
7 "branch: %s" % (last_version,
8- db.upstream_tag_name(last_version)))
9+ db.upstream_tag_name(str(last_version))))
10 upstream_tip = db.revid_of_upstream_version_from_branch(
11- last_version)
12+ last_version.upstream_version)
13 db.extract_upstream_tree(upstream_tip, tempdir)
14 else:
15 db._create_empty_upstream_tree(tempdir)

Subscribers

People subscribed via source and target branches

to all changes: