Mercurial > emacs
changeset 75719:a8fd93a515a2
(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>.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 07 Feb 2007 23:02:12 +0000 |
| parents | 6d4adbc3cfc3 |
| children | d93f8cf55f80 |
| files | lisp/ChangeLog lisp/vc-svn.el |
| diffstat | 2 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Feb 07 22:34:11 2007 +0000 +++ b/lisp/ChangeLog Wed Feb 07 23:02:12 2007 +0000 @@ -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.
--- a/lisp/vc-svn.el Wed Feb 07 22:34:11 2007 +0000 +++ b/lisp/vc-svn.el Wed Feb 07 23:02:12 2007 +0000 @@ -345,18 +345,23 @@ (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!