[Pkg-bazaar-commits] ./bzr-gtk/unstable r495: Merge workaround for broken handling of old merge directives

[Aaron Bentley]

------------------------------------------------------------
revno: 495
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzr-gtk
timestamp: Fri 2008-05-23 12:54:28 -0400
message:
  Merge workaround for broken handling of old merge directives
modified:
  tests/test_diff.py
    ------------------------------------------------------------
    revno: 493.1.1
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: bzr-gtk
    timestamp: Thu 2008-05-22 15:08:04 -0400
    message:
      Work around bug for old merge directives in bzr.dev
    modified:
      tests/test_diff.py
-------------- next part --------------
=== modified file 'tests/test_diff.py'
--- a/tests/test_diff.py	2008-05-12 20:21:45 +0000
+++ b/tests/test_diff.py	2008-05-22 19:08:04 +0000
@@ -19,7 +19,7 @@
 import os
 
 from bzrlib import errors, tests
-from bzrlib.merge_directive import MergeDirective
+from bzrlib.merge_directive import MergeDirective2
 
 from bzrlib.plugins.gtk.diff import (
     DiffController,
@@ -169,9 +169,9 @@
         other.commit('second commit')
         other.lock_write()
         try:
-            directive = MergeDirective.from_objects(other.branch.repository,
-                                                    other.last_revision(), 0,
-                                                    0, 'this')
+            directive = MergeDirective2.from_objects(other.branch.repository,
+                                                     other.last_revision(), 0,
+                                                     0, 'this')
         finally:
             other.unlock()
         return this, other, directive