/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_diff.py

  • Committer: Aaron Bentley
  • Date: 2008-05-22 02:33:40 UTC
  • mfrom: (487.2.8 save-patch)
  • Revision ID: aaron@aaronbentley.com-20080522023340-3x585s8593j6a409
Allow saving from patch window, refactoring, testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_diff.py
19
19
import os
20
20
 
21
21
from bzrlib import errors, tests
22
 
from bzrlib.merge_directive import MergeDirective2
 
22
from bzrlib.merge_directive import MergeDirective
23
23
 
24
24
from bzrlib.plugins.gtk.diff import (
25
25
    DiffController,
169
169
        other.commit('second commit')
170
170
        other.lock_write()
171
171
        try:
172
 
            directive = MergeDirective2.from_objects(other.branch.repository,
173
 
                                                     other.last_revision(), 0,
174
 
                                                     0, 'this')
 
172
            directive = MergeDirective.from_objects(other.branch.repository,
 
173
                                                    other.last_revision(), 0,
 
174
                                                    0, 'this')
175
175
        finally:
176
176
            other.unlock()
177
177
        return this, other, directive