Mercurial > emacs

changeset 104262:396d04b7c922

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-cvs-merge-news): Yet annother fix of message parsing.
author Sam Steingold <sds@gnu.org>
date Fri, 14 Aug 2009 04:24:01 +0000
parents bcbe3f3a3c5e
children dd7f2f8ff84f
files lisp/ChangeLog lisp/vc-cvs.el
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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