Mercurial > emacs

changeset 103747:4f648d5b56cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-cvs-merge-news): Fix message parsing for non-top-level files.
author Sam Steingold <sds@gnu.org>
date Tue, 07 Jul 2009 15:06:00 +0000
parents 143908a11f1f
children 5a1769adb8af
files lisp/ChangeLog lisp/vc-cvs.el
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Jul 07 08:38:44 2009 +0000
+++ b/lisp/ChangeLog	Tue Jul 07 15:06:00 2009 +0000
@@ -1,3 +1,8 @@
+2009-07-07  Sam Steingold  <sds@gnu.org>
+
+	* vc-cvs.el (vc-cvs-merge-news): Fix message parsing for
+	non-top-level files.
+
 2009-07-07  Kenichi Handa  <handa@m17n.org>
 
 	* international/mule-cmds.el (reset-language-environment): Put
--- a/lisp/vc-cvs.el	Tue Jul 07 08:38:44 2009 +0000
+++ b/lisp/vc-cvs.el	Tue Jul 07 15:06:00 2009 +0000
@@ -457,7 +457,8 @@
             0 ;; there were no news; indicate success
           (if (re-search-forward
                (concat "^\\([CMUP] \\)?"
-                       (regexp-quote (file-name-nondirectory file))
+                       (regexp-quote
+                        (substring file (length default-directory)))
                        "\\( already contains the differences between \\)?")
                nil t)
               (cond