[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-svn.el,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-svn.el,v |
Date: |
Thu, 10 Apr 2008 07:32:28 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/04/10 07:32:27
Index: vc-svn.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-svn.el,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- vc-svn.el 9 Apr 2008 03:38:38 -0000 1.76
+++ vc-svn.el 10 Apr 2008 07:32:25 -0000 1.77
@@ -160,7 +160,7 @@
(defun vc-svn-after-dir-status (callback buffer)
(let ((state-map '((?A . added)
- (?C . edited)
+ (?C . conflict)
(?D . removed)
(?I . ignored)
(?M . edited)
@@ -636,7 +636,9 @@
(vc-file-setprop file 'vc-working-revision "0")
(vc-file-setprop file 'vc-checkout-time 0)
'added)
- ((memq status '(?M ?C))
+ ((eq status ?C)
+ (vc-file-setprop file 'vc-state 'conflict))
+ ((eq status '?M)
(if (eq (char-after (match-beginning 1)) ?*)
'needs-merge
'edited))
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el,v, Dan Nicolaescu, 2008/04/08
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el,v,
Dan Nicolaescu <=
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el,v, Stefan Monnier, 2008/04/11
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el,v, Stefan Monnier, 2008/04/11
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el,v, Stefan Monnier, 2008/04/29