Mercurial > emacs

diff lisp/vc-bzr.el @ 107005:fb234c5a45ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from trunk
author Jason Rumney <jasonr@gnu.org>
date Thu, 07 Jan 2010 21:54:07 +0800
parents d94786c1fa6c
children 95040dd9104b
line wrap: on
line diff
--- a/lisp/vc-bzr.el	Thu Jan 07 21:53:57 2010 +0800
+++ b/lisp/vc-bzr.el	Thu Jan 07 21:54:07 2010 +0800
@@ -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))