diff options
| -rw-r--r-- | lisp/vc/vc-bzr.el | 6 |
1 files changed, 6 insertions, 0 deletions
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." | |||
| 954 | (translated nil) | 954 | (translated nil) |
| 955 | (result nil)) | 955 | (result nil)) |
| 956 | (goto-char (point-min)) | 956 | (goto-char (point-min)) |
| 957 | ;; Skip a warning message that can occur in some bzr installations. | ||
| 958 | ;; vc-bzr-dir-extra-headers already reports it. | ||
| 959 | ;; Perhaps we should just discard stderr? | ||
| 960 | (and (looking-at "bzr: WARNING: bzrlib version doesn't match") | ||
| 961 | (re-search-forward "^bzr is version" nil t) | ||
| 962 | (forward-line 1)) | ||
| 957 | (while (not (eobp)) | 963 | (while (not (eobp)) |
| 958 | ;; Bzr 2.3.0 added this if there are shelves. (Bug#8170) | 964 | ;; Bzr 2.3.0 added this if there are shelves. (Bug#8170) |
| 959 | (unless (looking-at "[0-9]+ shel\\(f\\|ves\\) exists?\\.") | 965 | (unless (looking-at "[0-9]+ shel\\(f\\|ves\\) exists?\\.") |