Fix for vc-svn-merge-news.

* vc/vc-svn.el (vc-svn-merge-news): Properly parse the merge
response when the target file is in a subdirectory.

Fixes: debbugs:12757

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0a9b22ebfffc923dc64a2605699d541efb23779f..75e09bff2a088c92491eae673099068ee9a3f9f3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-17  OKAZAKI Tetsurou  <okazaki.tetsurou@gmail.com>  (tiny change)
+
+       * vc/vc-svn.el (vc-svn-merge-news): Properly parse the merge
+       response when the target file is in a subdirectory (Bug#12757).
+
 2012-11-17  Chong Yidong  <cyd@gnu.org>
 
        * filecache.el (file-cache-add-file-list): Doc fix (Bug#12694).

diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index 6c2367c7ba6853ef5833e8bb0baa71be10a454dd..5142d25298232c2040b455cbd245f45866d9c3a1 100644 (file)
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -399,7 +399,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
                ;; We also used to match the filename in column 0 without any
                ;; meta-info before it, but I believe this can never happen.
                (concat "^\\(\\([ACGDU]\\)\\(.[B ]\\)?  \\)"
-                       (regexp-quote (file-name-nondirectory file)))
+                      (regexp-quote (file-relative-name file)))
                nil t)
               (cond
                ;; Merge successful, we are in sync with repository now