# HG changeset patch
# User Sam Steingold <sds@gnu.org>
# Date 1250223841 0
# Node ID 396d04b7c922cb3858ef4408611d605c58fc460f
# Parent  bcbe3f3a3c5edf476c0da21899e52e4ecde9d100
(vc-cvs-merge-news): Yet annother fix of message parsing.

diff -r bcbe3f3a3c5e -r 396d04b7c922 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Aug 13 18:08:25 2009 +0000
+++ b/lisp/ChangeLog	Fri Aug 14 04:24:01 2009 +0000
@@ -1,3 +1,7 @@
+2009-08-14  Sam Steingold  <sds@gnu.org>
+
+	* vc-cvs.el (vc-cvs-merge-news): Yet annother fix of message parsing.
+
 2009-08-13  Chong Yidong  <cyd@stupidchicken.com>
 
 	* faces.el (help-argument-name): Define it here instead of
diff -r bcbe3f3a3c5e -r 396d04b7c922 lisp/vc-cvs.el
--- a/lisp/vc-cvs.el	Thu Aug 13 18:08:25 2009 +0000
+++ b/lisp/vc-cvs.el	Fri Aug 14 04:24:01 2009 +0000
@@ -458,7 +458,8 @@
           (if (re-search-forward
                (concat "^\\([CMUP] \\)?"
                        (regexp-quote
-                        (substring file (length default-directory)))
+                        (substring file (length (expand-file-name
+                                                 "." default-directory))))
                        "\\( already contains the differences between \\)?")
                nil t)
               (cond