Subject: bug#8170: vc-dir choking on new bzr status output

From: Glenn Morris <[email-masked]>
Date: Fri, 04 Mar 2011 00:46:46 -0500

Correction:

*** lisp/vc/vc-bzr.el	2011-03-03 06:25:21 +0000
--- lisp/vc/vc-bzr.el	2011-03-04 05:46:43 +0000
***************
*** 879,884 ****
--- 879,886 ----
  	(result nil))
        (goto-char (point-min))
        (while (not (eobp))
+         ;; Bzr 2.3.0 added this if there are shelves.  (Bug#8170)
+         (unless (looking-at "[1-9]+ shel\\(f\\|ves\\) exists?\\.")
            (setq status-str
                  (buffer-substring-no-properties (point) (+ (point) 3)))
            (setq translated (cdr (assoc status-str translation)))
***************
*** 909,915 ****
  		       (buffer-substring-no-properties
  			(+ (point) 4)
  			(line-end-position)) relative-dir)
! 		      translated) result)))
  	(forward-line))
        (funcall update-function result)))
  
--- 911,917 ----
                           (buffer-substring-no-properties
                            (+ (point) 4)
                            (line-end-position)) relative-dir)
!                         translated) result))))
          (forward-line))
        (funcall update-function result)))