[Pkg-bazaar-commits] ./bzr-gtk/unstable r87: Fix diff window in nautilus.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 87
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr-gtk
timestamp: Tue 2006-10-03 19:08:31 +0200
message:
  Fix diff window in nautilus.
modified:
  TODO
  nautilus-bzr.py
-------------- next part --------------
=== modified file 'TODO'
--- a/TODO	2006-09-30 10:21:43 +0000
+++ b/TODO	2006-10-03 17:08:31 +0000
@@ -21,3 +21,4 @@
   in the main window.
 - Is there any reason why on win32 bzr branches have to be on fixed drives and 
   not on, e.g., cdroms?
+- Add a 'merge' window, allowing merges from other branches.

=== modified file 'nautilus-bzr.py'
--- a/nautilus-bzr.py	2006-09-06 09:27:12 +0000
+++ b/nautilus-bzr.py	2006-10-03 17:08:31 +0000
@@ -71,7 +71,7 @@
 
         from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
         window = DiffWindow()
-        window.set_diff(tree.branch, tree, tree.branch.revision_tree())
+        window.set_diff(tree.branch.nick, tree, tree.branch.basis_tree())
         window.show()
 
         return