Commit 459b1fe4 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(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>.
parent 8b57a7fd
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.
......@@ -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!
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment