diff options
| author | Alfred M. Szmidt | 2017-09-08 12:19:24 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2017-09-08 12:19:24 +0300 |
| commit | 9b9c93053a6691303b2ad73f107576e07cd69db4 (patch) | |
| tree | bbd033f21abe329ac5d6823cb0236fe18109a8b5 | |
| parent | e3476d293736d8e7d8d3ea47bba407ace15addbc (diff) | |
| download | emacs-9b9c93053a6691303b2ad73f107576e07cd69db4.tar.gz emacs-9b9c93053a6691303b2ad73f107576e07cd69db4.zip | |
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
| -rw-r--r-- | lisp/vc/vc-svn.el | 3 |
1 files changed, 1 insertions, 2 deletions
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." | |||
| 701 | (let (multifile file status propstat) | 701 | (let (multifile file status propstat) |
| 702 | (goto-char (point-min)) | 702 | (goto-char (point-min)) |
| 703 | (while (re-search-forward | 703 | (while (re-search-forward |
| 704 | ;; Ignore the files with status X. | 704 | "^\\(?:\\?\\|[ ACDGIMR!~][ MC][ L][ +][ SX]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t) |
| 705 | "^\\(?:\\?\\|[ ACDGIMR!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t) | ||
| 706 | ;; If the username contains spaces, the output format is ambiguous, | 705 | ;; If the username contains spaces, the output format is ambiguous, |
| 707 | ;; so don't trust the output's filename unless we have to. | 706 | ;; so don't trust the output's filename unless we have to. |
| 708 | (setq file (or (unless multifile filename) | 707 | (setq file (or (unless multifile filename) |