From: Chong Yidong <cyd@gnu.org>
Date: Sat, 17 Nov 2012 07:06:57 +0000 (+0800)
Subject: Fix for vc-svn-merge-news.
X-Git-Tag: emacs-24.2.90~54
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c2d075572cdd9973f91805e55f57511ba58e1ec4;p=emacs.git

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 0a9b22ebfff..75e09bff2a0 100644
--- 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 6c2367c7ba6..5142d252982 100644
--- 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