From: Glenn Morris <rgm@gnu.org>
Date: Tue, 28 Apr 2015 05:15:12 +0000 (-0700)
Subject: * lisp/vc/vc-bzr.el (vc-bzr-after-dir-status):
X-Git-Tag: emacs-25.0.90~2273
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=704ce9aeb61a85d9a5e29e2fad9067c51fca095f;p=emacs.git

* lisp/vc/vc-bzr.el (vc-bzr-after-dir-status):

Don't get confused by a bzrlib version mismatch warning.
---

diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 811f9e80b0c..9c52106fdb5 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -954,6 +954,12 @@ stream.  Standard error output is discarded."
 	(translated nil)
 	(result nil))
       (goto-char (point-min))
+      ;; Skip a warning message that can occur in some bzr installations.
+      ;; vc-bzr-dir-extra-headers already reports it.
+      ;; Perhaps we should just discard stderr?
+      (and (looking-at "bzr: WARNING: bzrlib version doesn't match")
+           (re-search-forward "^bzr is version" nil t)
+           (forward-line 1))
       (while (not (eobp))
         ;; Bzr 2.3.0 added this if there are shelves.  (Bug#8170)
         (unless (looking-at "[0-9]+ shel\\(f\\|ves\\) exists?\\.")