← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Lalo Martins
  • Date: 2005-09-16 12:53:47 UTC
  • mto: (1185.1.26)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: lalo@exoweb.net-20050916125347-e134440582d72d53
blackbox tests for diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
169
169
    if revision2 is None:
170
170
        new_tree = b.working_tree()
171
171
    else:
172
 
        new_tree = b.revision_tree(revision2.in_branch(b).rev_id)
 
172
        new_tree = b.revision_tree(revision2.in_history(b).rev_id)
173
173
 
174
174
    show_diff_trees(old_tree, new_tree, output, specific_files,
175
175
                    external_diff_options)