Merge lp:~tseaver/setuptoolsbzr/lp887518 into lp:setuptoolsbzr

Proposed by Tres Seaver on 2012-04-17
Status: Merged
Merged at revision: 16
Proposed branch: lp:~tseaver/setuptoolsbzr/lp887518
Merge into: lp:setuptoolsbzr
Diff against target: 12 lines (+1/-1)
1 file modified
setuptools_bzr/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~tseaver/setuptoolsbzr/lp887518
Reviewer Review Type Date Requested Status
Barry Warsaw 2012-04-17 Pending
Review via email: mp+102329@code.launchpad.net

Description of the change

Make setuptoolsbzr work with recent bzr versions. Note that I didn't try for
the backward-compatibility win (working with bzr < 2.2).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setuptools_bzr/__init__.py'
2--- setuptools_bzr/__init__.py 2010-11-04 20:23:07 +0000
3+++ setuptools_bzr/__init__.py 2012-04-17 15:05:21 +0000
4@@ -47,7 +47,7 @@
5 branch.lock_read()
6 try:
7 # Get the inventory of the branch's last revision.
8- inv = branch.repository.get_revision_inventory(branch.last_revision())
9+ inv = branch.repository.get_inventory(branch.last_revision())
10 # Get the inventory entry for the path.
11 entry = inv[inv.path2id(path)]
12 # Return the names of the children.

Subscribers

People subscribed via source and target branches