2 files changed, 10 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c806c616b9..a15fca9ebd7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vc-bzr.el (vc-bzr-working-revision): Recognize a newer branch
+        format.  Use when instead of if.
+
 2009-02-04  Miles Bader  <miles@gnu.org>
 
         * emacs-lisp/lisp.el (forward-sexp, backward-sexp, forward-list)
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index f04eb3da591..5c8b50bc191 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -338,11 +338,13 @@ If any error occurred in running `bzr status', then return nil."
             ;; count lines in .bzr/branch/revision-history
             (insert-file-contents revhistory-file)
             (number-to-string (count-lines (line-end-position) (point-max))))
-           ((looking-at "Bazaar Branch Format 6 (bzr 0.15)")
+           ((or
+             (looking-at "Bazaar Branch Format 6 (bzr 0.15)")
+             (looking-at "Bazaar Branch Format 7 (needs bzr 1.6)"))
             ;; revno is the first number in .bzr/branch/last-revision
             (insert-file-contents lastrev-file)
-            (if (re-search-forward "[0-9]+" nil t)
-                (buffer-substring (match-beginning 0) (match-end 0))))))
+            (when (re-search-forward "[0-9]+" nil t)
+              (buffer-substring (match-beginning 0) (match-end 0))))))
       ;; fallback to calling "bzr revno"
       (lexical-let*
           ((result (vc-bzr-command-discarding-stderr