vc-bzr.el patch minor bug fix

Colin D Bennett colin at gibibit.com
Tue Nov 1 17:15:59 UTC 2011


On Wed, 26 Oct 2011 00:24:40 +0200
Juanma Barranquero <lekktu at gmail.com> wrote:

> === modified file 'lisp/vc/vc-bzr.el'
> --- lisp/vc/vc-bzr.el   2011-03-04 17:24:02 +0000
> +++ lisp/vc/vc-bzr.el   2011-03-12 15:26:33 +0000
> @@ -435,8 +435,13 @@
>  (defun vc-bzr-state (file)
>    (lexical-let ((result (vc-bzr-status file)))
>      (when (consp result)
> -      (when (cdr result)
> -       (message "Warnings in `bzr' output: %s" (cdr result)))
> +      (let ((warnings (cdr result)))
> +        (when warnings
> +          ;; bzr 2.3.0 returns info about shelves, which is not
> really a warning
> +          (when (string-match "[1-9]+ shel\\(f\\|ves\\)
> exists?\\..*?\n" warnings)

You probably should replace [1-9]+ with [0-9]+ so that “10 shelves”
matches.

Regards,
Colin



More information about the bazaar mailing list