# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1262793859 -3600
# Node ID b6846b19b0db09393c7fa17b276092db4b6c294a
# Parent  10b9609fb6b7113e16ef257913aec520eaaf9d08# Parent  06b47f5710866f1133a7d999a81e7c8b353beb84
Merge from trunk

diff -r 10b9609fb6b7 -r b6846b19b0db lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jan 06 17:03:26 2010 +0100
+++ b/lisp/ChangeLog	Wed Jan 06 17:04:19 2010 +0100
@@ -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 -r 10b9609fb6b7 -r b6846b19b0db lisp/vc-bzr.el
--- a/lisp/vc-bzr.el	Wed Jan 06 17:03:26 2010 +0100
+++ b/lisp/vc-bzr.el	Wed Jan 06 17:04:19 2010 +0100
@@ -671,7 +671,6 @@
                        ;; 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 @@
 		       ;; 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))