emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 9b9c930: Support SVN files with svn:externals prope


From: Eli Zaretskii
Subject: [Emacs-diffs] master 9b9c930: Support SVN files with svn:externals property
Date: Fri, 8 Sep 2017 05:20:25 -0400 (EDT)

branch: master
commit 9b9c93053a6691303b2ad73f107576e07cd69db4
Author: Alfred M. Szmidt <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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
---
 lisp/vc/vc-svn.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index a67c226..f1e8985 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]