Rev 625: Merge trunk. in http://people.samba.org/bzr/jelmer/bzr-gtk/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-gtk/trunk

------------------------------------------------------------
revno: 625
revision-id: jelmer at samba.org-20090112011935-2w6c6e1aigl4imd9
parent: jelmer at samba.org-20081128164225-fzvl9pxk1ki77qoj
parent: v.ladeuil+lp at free.fr-20081201155226-k6sc6voqbao02hgj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2009-01-12 02:19:35 +0100
message:
  Merge trunk.
modified:
  status.py                      status.py-20060803143043-mmdp58hu3hauy0xh-1
    ------------------------------------------------------------
    revno: 621.1.2
    revision-id: v.ladeuil+lp at free.fr-20081201155226-k6sc6voqbao02hgj
    parent: v.ladeuil+lp at free.fr-20081106154524-n9al5n1pome2xo0u
    parent: jelmer at samba.org-20081125152552-3m6l42ab2u676caj
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: 289220-gstatus-reverse-diff
    timestamp: Mon 2008-12-01 16:52:26 +0100
    message:
      merge trunk
    added:
      tests/test_revisionview.py     test_revisionview.py-20081113063733-yjzw3fm2tldbx44f-1
    modified:
      commit.py                      commit.py-20060721181724-0mfkrqwpsa09q1t3-3
      revisionview.py                logview.py-20051024072750-4d5c28cb73611027
      setup.py                       setup.py-20060716162505-h2isrtlg8lmlg2o2-1
      tests/__init__.py              __init__.py-20070201155018-mi2dl3spgj7fqdum-1
      tests/test_commit.py           test_commit.py-20070928204312-v6ffg8vz27644log-2
    ------------------------------------------------------------
    revno: 621.1.1
    revision-id: v.ladeuil+lp at free.fr-20081106154524-n9al5n1pome2xo0u
    parent: jelmer at samba.org-20081030134844-8aayszl9iefcxt1x
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: 289220-gstatus-reverse-diff
    timestamp: Thu 2008-11-06 16:45:24 +0100
    message:
      Fix bug #289220 by using the right parameter order.
      
      * status.py:
      (StatusWindow.row_diff): One can argue that the parameters are in
      the wrong order or just respect their meaning :) Thanks to Anne
      Mohsen for noticing and proposing the fix.
    modified:
      status.py                      status.py-20060803143043-mmdp58hu3hauy0xh-1
=== modified file 'status.py'
--- a/status.py	2008-10-23 08:14:59 +0000
+++ b/status.py	2008-11-06 15:45:24 +0000
@@ -66,7 +66,7 @@
             return
         from bzrlib.plugins.gtk.diff import DiffWindow
         window = DiffWindow()
-        window.set_diff("Working tree changes", self.old_tree, self.wt)
+        window.set_diff("Working tree changes", self.wt, self.old_tree)
         window.set_file(file)
         window.show()