Mercurial > emacs
changeset 50821:33e415a24bb5
(vc-svn-merge-news): Adjust for subversion.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 05 May 2003 16:06:10 +0000 |
| parents | fc3f65557bc8 |
| children | 0be6233722ec |
| files | lisp/vc-svn.el |
| diffstat | 1 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-svn.el Mon May 05 15:49:23 2003 +0000 +++ b/lisp/vc-svn.el Mon May 05 16:06:10 2003 +0000 @@ -350,29 +350,27 @@ (goto-char (point-min)) ;; get new workfile version (if (re-search-forward - "^Merging differences between [0-9.]* and \\([0-9.]*\\) into" nil t) - (vc-file-setprop file 'vc-workfile-version (match-string 1)) + "^\\(Updated to\\|At\\) revision \\([0-9]+\\)" nil t) + (vc-file-setprop file 'vc-workfile-version (match-string 2)) (vc-file-setprop file 'vc-workfile-version nil)) ;; get file status + (goto-char (point-min)) (prog1 - (if (eq (buffer-size) 0) + (if (looking-at "At revision") 0 ;; there were no news; indicate success (if (re-search-forward - (concat "^\\([CMUP] \\)?" - (regexp-quote (file-name-nondirectory file)) - "\\( already contains the differences between \\)?") + (concat "^\\([CGDU] \\)?" + (regexp-quote (file-name-nondirectory file))) nil t) (cond ;; Merge successful, we are in sync with repository now - ((or (match-string 2) - (string= (match-string 1) "U ") - (string= (match-string 1) "P ")) + ((string= (match-string 1) "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) "M ") + ((string= (match-string 1) "G ") (vc-file-setprop file 'vc-state 'edited) 0);; indicate success to the caller ;; Conflicts detected!