From: W Morgan Stair <morgan.stair(a)openwave.com&gt; To: "Albert L. Ting" <alt(a)artisan.com&gt; CC: W Morgan Stair <morgan.stair(a)openwave.com&gt; Subject: vc-hooks.el patch to handle "Results of merge+" Date: Mon, 13 Aug 2001 16:40:12 -0400 Hi, I'm not set up to submit vc enhancements via normal channels, but this fix has helped me out so I thought I'd send it to you. When cvs does a merge, it makes an annotation in the entries file that screws up vc. Here's the diff to fix it (by ignoring the inserted comment): --- vc-hooks.el.orig Fri Apr 27 20:04:20 2001 +++ vc-hooks.el Mon Aug 13 16:31:37 2001 ＠＠ -922,7 +922,9 ＠＠ For CVS, the full name of CVS/Entries is ;; revision "/\\([^/]*\\)" ;; timestamp - "/[A-Z][a-z][a-z]" ;; week day (irrelevant) + "/" + "\\(?:[^/+]+\\+\\)?" ;; merge (irrelevant) + "[A-Z][a-z][a-z]" ;; week day (irrelevant) " \\([A-Z][a-z][a-z]\\)" ;; month name " *\\([0-9]*\\)" ;; day of month " \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\)" ;; hms -- W Morgan Stair (781-564-5506) Messaging Infrastructure Development, Openwave Systems, Inc. =====================================================================