Mercurial > emacs

changeset 59313:ad91f130fbdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-arch-workfile-version): Fix last change.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 02 Jan 2005 22:07:52 +0000
parents 945a627eedd9
children 9c620c1aa7fa
files lisp/vc-arch.el
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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))