diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2003-05-05 16:06:10 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2003-05-05 16:06:10 +0000 |
| commit | 1468d75485eeb4dc227384f6dbfed4c7b1db5f86 (patch) | |
| tree | a2dc655e97b194e14fa8a7d3fd25aa57549e8e4e /lisp/vc-svn.el | |
| parent | 478e7df5d072f364d06847540ca09adb22d5abde (diff) | |
| download | emacs-1468d75485eeb4dc227384f6dbfed4c7b1db5f86.tar.gz | |
(vc-svn-merge-news): Adjust for subversion.
Diffstat (limited to 'lisp/vc-svn.el')
| -rw-r--r-- | lisp/vc-svn.el | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 3117a0a33bd..031ca0d9018 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -350,29 +350,27 @@ The changes are between FIRST-VERSION and SECOND-VERSION." (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! |