From: Alfred M. Szmidt Date: Fri, 8 Sep 2017 09:19:24 +0000 (+0300) Subject: Support SVN files with svn:externals property X-Git-Tag: emacs-26.0.90~227 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9b9c93053a6691303b2ad73f107576e07cd69db4;p=emacs.git Support SVN files with svn:externals property * lisp/vc/vc-svn.el (vc-svn-parse-status): Don't ignore files marked with the svn:externals property. Copyright-paperwork-exempt: yes --- diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index a67c2264d80..f1e8985c167 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -701,8 +701,7 @@ Set file properties accordingly. If FILENAME is non-nil, return its status." (let (multifile file status propstat) (goto-char (point-min)) (while (re-search-forward - ;; Ignore the files with status X. - "^\\(?:\\?\\|[ ACDGIMR!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t) + "^\\(?:\\?\\|[ ACDGIMR!~][ MC][ L][ +][ SX]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t) ;; If the username contains spaces, the output format is ambiguous, ;; so don't trust the output's filename unless we have to. (setq file (or (unless multifile filename)