Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Dominique de Waleffe wrote:
> I upgraded from 1.11.3 build 57f to 2.08 yesterday.
That pcl-cvs not working anymore was annoying us so much that I spent some
time trying to fix it.
The latest cvsnt exposes extra messages in the cvs status output.
I had to change the cvs-parse-status function in pcvs-parse.el to cope
with the extra messages.
This might help someone...
D.
Here's the diff:
diff -c "t:/fsd/freesoft/emacs-21.3/lisp/pcvs-parse.el.~1~"
"t:/fsd/freesoft/emacs-21.3/lisp/pcvs-parse.el"
*** t:/fsd/freesoft/emacs-21.3/lisp/pcvs-parse.el.~1~ Mon Sep 24 18:39:24
2001
--- t:/fsd/freesoft/emacs-21.3/lisp/pcvs-parse.el Thu Aug 28 13:19:08 2003
***************
*** 453,465 ****
(cvs-match " *Repository revision:[ \t]*\\([0-9.]+\\)[
\t]*\\(.*\\)$"
(head-rev 1))
(cvs-match " *Repository revision:.*"))
(cvs-or
(and;;sometimes those fields are missing
(cvs-match " *Sticky Tag:[ \t]*\\(.*\\)$") ; FIXME: use it
(cvs-match " *Sticky Date:[ \t]*\\(.*\\)$") ; FIXME: use it
(cvs-match " *Sticky Options:[ \t]*\\(.*\\)$")) ; FIXME: use it
t)
! (cvs-match "$")
;; ignore the tags-listing in the case of `status -v'
(cvs-or (cvs-match " *Existing Tags:\n\\(\t.*\n\\)*$") t)
(cvs-parsed-fileinfo type path nil
--- 453,490 ----
(cvs-match " *Repository revision:[ \t]*\\([0-9.]+\\)[
\t]*\\(.*\\)$"
(head-rev 1))
(cvs-match " *Repository revision:.*"))
+ ;; CVSNT: exposes extra information in its status report:
+ ;; Expansion option
+ ;; Commit Identifier
+ ;; Merge From
+ ;; The following checks for those extra lines as optional
+ ;; matches.
+ ;;>>>>
+ ;; ddw Thu Aug 28 13:11:22 2003
+ ;; cvsnt 2.0.8
+ (cvs-or
+ (cvs-match " *Expansion option:.*$")
+ t)
+ (cvs-or
+ (cvs-match " *Commit Identifier:.*$")
+ t)
+ ;; ddw Thu Aug 28 13:13:12 2003
+ ;;<<<<
(cvs-or
(and;;sometimes those fields are missing
(cvs-match " *Sticky Tag:[ \t]*\\(.*\\)$") ; FIXME: use it
(cvs-match " *Sticky Date:[ \t]*\\(.*\\)$") ; FIXME: use it
(cvs-match " *Sticky Options:[ \t]*\\(.*\\)$")) ; FIXME: use it
t)
! ;;>>>>
! ;; ddw Thu Aug 28 13:11:22 2003
! ;; cvsnt 2.0.8
! (cvs-or
! (cvs-match " *Merge From:.*$")
! t)
! ;; ddw Thu Aug 28 13:13:12 2003
! ;;<<<<
! (cvs-match "$")
;; ignore the tags-listing in the case of `status -v'
(cvs-or (cvs-match " *Existing Tags:\n\\(\t.*\n\\)*$") t)
(cvs-parsed-fileinfo type path nil
Diff finished at Thu Aug 28 13:19:53