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

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

Try this:

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