Index: vc/bzr.py
===================================================================
RCS file: /cvs/gnome/meld/vc/bzr.py,v
retrieving revision 1.2
diff -u -r1.2 bzr.py
--- vc/bzr.py	2 Feb 2006 23:22:19 -0000	1.2
+++ vc/bzr.py	26 Jul 2006 01:41:11 -0000
@@ -82,6 +82,7 @@
             "modified:": _vc.STATE_MODIFIED,
             "conflicts:": _vc.STATE_CONFLICT }
         tree_state = {}
+        cur_state = None
         for entry in entries:
             if entry == "pending merges:":
                 break
