[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Re: should .subversion/config hint to ignore .DS_Store?

From: <cmpilato_at_collab.net>
Date: 2003-08-09 06:04:44 CEST

Jack Repenning <jrepenning@collab.net> writes:

> The config file installed into ~/.subversion (or wherever your
> favorite platform puts these things) includes a commented-out section,
> [miscellany], which includes a commented-out global-ignores setting.
> While I realize this is all commented out, so very little will go
> horribly wrong if it's slightly incomplete, still it's useful
> documentation/hintage.
>
> I think maybe it should include ".DS_Store" in the list of things to
> global-ignore. This is a MacOS X thing; MacOS creates them freely in
> the HFS+ volumes. I think I used to know what they are, but I forget
> ;-) Google will show you several discussions about getting them into
> .cvsignore. Google wil also show you several .DS_Store files that
> have already been checked into Subversion repositories, e.g. at
> svn.sabi.net/.../ICeCoffEEE/. I very much suspect this was an error
> ;-)

Here's a patch if folks want to review/commit it. I can't test it
(not a Mac user), and it ain't my itch.

--
* subversion/libsvn_subr/config_file.c
  (svn_config_ensure): Add ".DS_Store" to the string of default global
    ignores that gets written into a new config area.
* subversion/libsvn_wc/status.c
  (svn_wc_get_default_ignores): Add ".DS_Store" to the list of default
    global ignores.
Index: subversion/libsvn_wc/status.c
===================================================================
--- subversion/libsvn_wc/status.c	(revision 6674)
+++ subversion/libsvn_wc/status.c	(working copy)
@@ -50,7 +50,7 @@
      If no configuration value exists, we fall back to our defaults. */
   svn_config_get (cfg, &val, SVN_CONFIG_SECTION_MISCELLANY, 
                   SVN_CONFIG_OPTION_GLOBAL_IGNORES,
-                  "*.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#*");
+                  "*.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store");
   *patterns = apr_array_make (pool, 16, sizeof (const char *));
 
   /* Split the patterns on whitespace, and stuff them into *PATTERNS. */
Index: subversion/libsvn_subr/config_file.c
===================================================================
--- subversion/libsvn_subr/config_file.c	(revision 6674)
+++ subversion/libsvn_subr/config_file.c	(working copy)
@@ -953,7 +953,8 @@
         "# [miscellany]\n"
         "### Set global-ignores to a set of whitespace-delimited globs\n"
         "###   which Subversion will ignore in its `status' output.\n"
-        "# global-ignores = *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#*\n"
+        "# global-ignores = "
+        "*.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store\n"
         "### Set log-encoding to the default encoding for log messages\n"
         "# log-encoding = latin1\n"
         "\n"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Aug 9 06:07:04 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.