Mercurial > emacs
changeset 17642:565cdf5446e2
(vc-find-cvs-master): Accept ...+ in a normal entry.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 04 May 1997 06:49:53 +0000 |
| parents | 4650d25e48f6 |
| children | fd27882450bd |
| files | lisp/vc-hooks.el |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-hooks.el Sun May 04 03:47:13 1997 +0000 +++ b/lisp/vc-hooks.el Sun May 04 06:49:53 1997 +0000 @@ -786,7 +786,7 @@ ;; normal entry ((re-search-forward (concat "^/" (regexp-quote basename) - "/\\([^/]*\\)/[^ /]* \\([A-Z][a-z][a-z]\\) *\\([0-9]*\\) \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\) \\([0-9]*\\)") + "/\\([^/]*\\)/\\([^/+]*\\+\\)?[^ /]* \\([A-Z][a-z][a-z]\\) *\\([0-9]*\\) \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\) \\([0-9]*\\)") nil t) (setq case-fold-search fold) ;; restore the old value ;; We found it. Store away version number now that we @@ -797,16 +797,16 @@ ;; If the file hasn't been modified since checkout, ;; store the checkout-time. (let ((mtime (nth 5 (file-attributes file))) - (second (string-to-number (match-string 6))) - (minute (string-to-number (match-string 5))) - (hour (string-to-number (match-string 4))) - (day (string-to-number (match-string 3))) - (year (string-to-number (match-string 7)))) + (second (string-to-number (match-string 7))) + (minute (string-to-number (match-string 6))) + (hour (string-to-number (match-string 5))) + (day (string-to-number (match-string 4))) + (year (string-to-number (match-string 8)))) (if (equal mtime (encode-time second minute hour day (/ (string-match - (match-string 2) + (match-string 3) "xxxJanFebMarAprMayJunJulAugSepOctNovDec") 3) year 0))