unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* vc-svn and svn:externals
@ 2017-09-02 18:16 Alfred M. Szmidt
  2017-09-08  9:21 ` Eli Zaretskii
  0 siblings, 1 reply; 3+ messages in thread
From: Alfred M. Szmidt @ 2017-09-02 18:16 UTC (permalink / raw)
  To: emacs-devel

This makes sure that vc-svn handles the svn:externals property so that
vc-diff/vc-log/... etc work on files that are pulled in via that
mechanism.

2017-09-02  Alfred M. Szmidt  <ams@gnu.org>  (tiny change)

	* lisp/vc/vc-svn.el (vc-svn-parse-status): Don't ignore files
	marked with the svn:externals property.

diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index db16eb2..5ff1262 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -700,8 +700,7 @@ vc-svn-parse-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)



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: vc-svn and svn:externals
  2017-09-02 18:16 vc-svn and svn:externals Alfred M. Szmidt
@ 2017-09-08  9:21 ` Eli Zaretskii
  2017-09-13 19:18   ` Alfred M. Szmidt
  0 siblings, 1 reply; 3+ messages in thread
From: Eli Zaretskii @ 2017-09-08  9:21 UTC (permalink / raw)
  To: Alfred M. Szmidt; +Cc: emacs-devel

> From: ams@gnu.org (Alfred M. Szmidt)
> Date: Sat, 02 Sep 2017 14:16:29 -0400
> 
> This makes sure that vc-svn handles the svn:externals property so that
> vc-diff/vc-log/... etc work on files that are pulled in via that
> mechanism.
> 
> 2017-09-02  Alfred M. Szmidt  <ams@gnu.org>  (tiny change)
> 
> 	* lisp/vc/vc-svn.el (vc-svn-parse-status): Don't ignore files
> 	marked with the svn:externals property.

Thanks, pushed to the master branch.



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: vc-svn and svn:externals
  2017-09-08  9:21 ` Eli Zaretskii
@ 2017-09-13 19:18   ` Alfred M. Szmidt
  0 siblings, 0 replies; 3+ messages in thread
From: Alfred M. Szmidt @ 2017-09-13 19:18 UTC (permalink / raw)
  To: Eli Zaretskii; +Cc: emacs-devel

   > This makes sure that vc-svn handles the svn:externals property so that
   > vc-diff/vc-log/... etc work on files that are pulled in via that
   > mechanism.
   > 
   > 2017-09-02  Alfred M. Szmidt  <ams@gnu.org>  (tiny change)
   > 
   > 	* lisp/vc/vc-svn.el (vc-svn-parse-status): Don't ignore files
   > 	marked with the svn:externals property.

   Thanks, pushed to the master branch.

Thanks! One can close #18975, which I just stumbled upon.



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-09-13 19:18 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-02 18:16 vc-svn and svn:externals Alfred M. Szmidt
2017-09-08  9:21 ` Eli Zaretskii
2017-09-13 19:18   ` Alfred M. Szmidt

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).