(vc-cvs-merge-news): Fix message parsing for non-top-level files.

9ba562d3 · Sam Steingold · fcaf6f3a · 9ba562d3 · 9ba562d3
Commit 9ba562d3 authored Jul 07, 2009 by Sam Steingold
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +5 -0

lisp/vc-cvs.el lisp/vc-cvs.el +2 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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
+++ 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