From 704ce9aeb61a85d9a5e29e2fad9067c51fca095f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 27 Apr 2015 22:15:12 -0700 Subject: [PATCH] * lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Don't get confused by a bzrlib version mismatch warning. --- lisp/vc/vc-bzr.el | 6 ++++++ 1 file changed, 6 insertions(+) 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?\\.") -- 2.11.4.GIT