(vc-svn-merge-news): Understand the new format with two

added columns of chars.  Remove support for the "no-meta-info" format.
Prompted by Romain Francoise <romain@orebokech.com>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a4d8c5eeadcb5ca7cfc10d0670bc5c53a4e593fc..41b1295ef3731901c709ab48d694ab0691f801fa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * vc-svn.el (vc-svn-merge-news): Understand the new format with two
+       added columns of chars.  Remove support for the "no-meta-info" format.
+       Prompted by Romain Francoise <romain@orebokech.com>.
+
 2007-02-07  Nick Roberts  <nickrob@snap.net.nz>
 
        * progmodes/gdb-ui.el (gdb-if-arrow): New macro.

diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 916930ffde2774d588b36b6e0709f8cee75ac595..730806fdcd08c191e852b66f64b877f5fff9dd88 100644 (file)
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -345,18 +345,23 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
         (if (looking-at "At revision")
             0 ;; there were no news; indicate success
           (if (re-search-forward
-               (concat "^\\([CGDU]  \\)?"
+               ;; Newer SVN clients have 3 columns of chars (one for the
+               ;; file's contents, then second for its properties, and the
+               ;; third for lock-grabbing info), before the 2 spaces.
+               ;; 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)))
                nil t)
               (cond
                ;; Merge successful, we are in sync with repository now
-               ((string= (match-string 1) "U  ")
+               ((string= (match-string 2) "U")
                 (vc-file-setprop file 'vc-state 'up-to-date)
                 (vc-file-setprop file 'vc-checkout-time
                                  (nth 5 (file-attributes file)))
                 0);; indicate success to the caller
                ;; Merge successful, but our own changes are still in the file
-               ((string= (match-string 1) "G  ")
+               ((string= (match-string 2) "G")
                 (vc-file-setprop file 'vc-state 'edited)
                 0);; indicate success to the caller
                ;; Conflicts detected!