[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110898: Fix for vc-svn-merge-news.

[Chong Yidong]

------------------------------------------------------------
revno: 110898
fixes bug: http://debbugs.gnu.org/12757
committer: Chong Yidong <address@hidden>
branch nick: emacs-24
timestamp: Sat 2012-11-17 15:06:57 +0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/vc/vc-svn.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-17 06:09:49 +0000
+++ b/lisp/ChangeLog    2012-11-17 07:06:57 +0000
@@ -1,3 +1,8 @@
+2012-11-17  OKAZAKI Tetsurou  <address@hidden>  (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  <address@hidden>
 
        * filecache.el (file-cache-add-file-list): Doc fix (Bug#12694).

=== modified file 'lisp/vc/vc-svn.el'
--- a/lisp/vc/vc-svn.el 2012-02-25 04:29:09 +0000
+++ b/lisp/vc/vc-svn.el 2012-11-17 07:06:57 +0000
@@ -399,7 +399,7 @@
                ;; 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