Author: mattiase
Date: Thu Jan 10 20:28:32 2013
New Revision: 1431615
URL: http://svn.apache.org/viewvc?rev=1431615&view=rev
Log:
Allow svn-resolve (R) on lines with tree conflicts as well, not just
text conflicts.
* contrib/client-side/emacs/dsvn.el
(svn-resolve): Accept lines with tree conflicts.
Modified:
subversion/trunk/contrib/client-side/emacs/dsvn.el
Modified: subversion/trunk/contrib/client-side/emacs/dsvn.el
URL:
http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/emacs/dsvn.el?rev=1431615&r1=1431614&r2=1431615&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/emacs/dsvn.el (original)
+++ subversion/trunk/contrib/client-side/emacs/dsvn.el Thu Jan 10 20:28:32 2013
@@ -1864,8 +1864,8 @@ argument."
(interactive)
(let ((files (svn-action-files
(lambda (pos)
- (or (= (svn-file-status pos) ?C)
- (= (svn-prop-status pos) ?C)
+ (or (memq (svn-file-status pos) '(?C ?!))
+ (memq (svn-prop-status pos) '(?C ?!))
(error "%s has no conflicts"
(svn-getprop pos 'file)))))))
(make-local-variable 'svn-resolved-files)
