[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-svn.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-svn.el |
Date: |
Mon, 05 May 2003 12:06:10 -0400 |
Index: emacs/lisp/vc-svn.el
diff -c emacs/lisp/vc-svn.el:1.2 emacs/lisp/vc-svn.el:1.3
*** emacs/lisp/vc-svn.el:1.2 Mon May 5 11:49:23 2003
--- emacs/lisp/vc-svn.el Mon May 5 12:06:10 2003
***************
*** 350,378 ****
(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))
(vc-file-setprop file 'vc-workfile-version nil))
;; get file status
(prog1
! (if (eq (buffer-size) 0)
0 ;; there were no news; indicate success
(if (re-search-forward
! (concat "^\\([CMUP] \\)?"
! (regexp-quote (file-name-nondirectory file))
! "\\( already contains the differences between \\)?")
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 "))
(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 ")
(vc-file-setprop file 'vc-state 'edited)
0);; indicate success to the caller
;; Conflicts detected!
--- 350,376 ----
(goto-char (point-min))
;; get new workfile version
(if (re-search-forward
! "^\\(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 (looking-at "At revision")
0 ;; there were no news; indicate success
(if (re-search-forward
! (concat "^\\([CGDU] \\)?"
! (regexp-quote (file-name-nondirectory file)))
nil t)
(cond
;; Merge successful, we are in sync with repository now
! ((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) "G ")
(vc-file-setprop file 'vc-state 'edited)
0);; indicate success to the caller
;; Conflicts detected!
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/05
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/05
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/05
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/05
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/08
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/09
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/09
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/14