bzr-undelete

Merge lp:~bialix/bzr-undelete/2.4 into lp:bzr-undelete

  1. 2.4
  2. Merge into trunk
Proposed by Alexander Belchenko
Status: Needs review
Proposed branch: lp:~bialix/bzr-undelete/2.4
Merge into: lp:bzr-undelete
Diff against target: 21 lines (+2/-2)
1 file modified
undelete.py (+2/-2)
To merge this branch: bzr merge lp:~bialix/bzr-undelete/2.4
Reviewer Review Type Date Requested Status
trident_job (community) Approve
Parth Malwankar Pending
Review via email: mp+72054@code.launchpad.net

Description of the change

Compatibility with bzr 2.4

To post a comment you must log in.
Revision history for this message
trident_job (trident-job) wrote :

Accepted (minor modification)

review: Approve
Reply

Unmerged revisions

26. By Alexander Belchenko

update code to work with bzr 2.4+

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'undelete.py'
2--- undelete.py 2009-02-24 16:40:51 +0000
3+++ undelete.py 2011-08-18 15:20:23 +0000
4@@ -32,7 +32,7 @@
5 tree.lock_read()
6
7 try:
8- rt = revisiontree.RevisionTree(br, tree.inventory, revision_id)
9+ rt = revisiontree.InventoryRevisionTree(br.repository, tree.inventory, revision_id)
10 print_rev = True
11 for file in rt.list_files():
12 name = file[0]
13@@ -69,7 +69,7 @@
14 tree = revision_spec.as_tree(br)
15 tree.lock_read()
16 try:
17- rt = revisiontree.RevisionTree(br, tree.inventory, revision_id)
18+ rt = revisiontree.InventoryRevisionTree(br.repository, tree.inventory, revision_id)
19 if rt.has_filename(filepath):
20 f_id = tree.path2id(filepath)
21 wt.revert(filenames = [filepath], old_tree=tree)

Subscribers

People subscribed via source and target branches