2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7196d29c477..6e9bbb1ef46 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index c3f94dc2a15..6ef8db50537 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -457,7 +457,8 @@ The changes are between FIRST-REVISION and SECOND-REVISION."
             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