(vc-bzr-after-dir-status): Ignore pending merges.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2827ff8d9d51f90004b9cd85c256a4c6b9597039..a5569604bd8f6eddb14e2d19dd76bf806fdd455e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-06  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc-bzr.el (vc-bzr-after-dir-status): Ignore pending merges.
+
 2010-01-05  Tom Tromey  <tromey@redhat.com>
 
        * progmodes/python.el (python-font-lock-keywords): Handle

diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index d0b8ec8ff6ae52d8febb432cdaa187fcd186ff15..f140671be1227f2d6fadd677b548803284e323c9 100644 (file)
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -671,7 +671,6 @@ stream.  Standard error output is discarded."
                        ;; For conflicts, should we list the .THIS/.BASE/.OTHER?
                       ("C  " . conflict)
                       ("?  " . unregistered)
-                      ("?  " . unregistered)
                       ;; No such state, but we need to distinguish this case.
                       ("R  " . renamed)
                       ;; For a non existent file FOO, the output is:
@@ -683,6 +682,8 @@ stream.  Standard error output is discarded."
                       ;; FIXME: maybe this warning can be put in the vc-dir header...
                       ("wor" . not-found)
                        ;; Ignore "P " and "P." for pending patches.
+                      ("P  " . not-found)
+                      ("P. " . not-found)
                        ))
        (translated nil)
        (result nil))