# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1104703672 0
# Node ID ad91f130fbdfcff9bc53d14f5ef99b9733f9d5e9
# Parent  945a627eedd995b17b5283028b1aa3085b178840
(vc-arch-workfile-version): Fix last change.

diff -r 945a627eedd9 -r ad91f130fbdf lisp/vc-arch.el
--- a/lisp/vc-arch.el	Sun Jan 02 22:00:07 2005 +0000
+++ b/lisp/vc-arch.el	Sun Jan 02 22:07:52 2005 +0000
@@ -270,7 +270,7 @@
 (defun vc-arch-workfile-version (file)
   (let* ((root (expand-file-name "{arch}" (vc-arch-root file)))
 	 (defbranch (vc-arch-default-version file)))
-    (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*\\)\\(--.*\\)?\\)--.*\\)\\'" defbranch))
+    (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*?\\)\\(?:--.*\\)?\\)--.*\\)\\'" defbranch))
       (let* ((archive (match-string 1 defbranch))
 	     (category (match-string 4 defbranch))
 	     (branch (match-string 3 defbranch))