You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Kobayashi Noritada <no...@dolphin.c.u-tokyo.ac.jp> on 2005/03/28 15:22:29 UTC

[PATCH] Reformat the template for .subversion/config

Hi,

This patch reformats the template for .subversion/config
for convenience of users since they may prefer a configuration item
immediately following its description.

Thanks,

- nori


Log:
Reformat the template for .subversion/config for convenience of
users since they may prefer a configuration item immediately
following its description. Actually most of configuration items
have already been in that format.

* subversion/libsvn_subr/config_file.c
  (svn_config_ensure): Tweak a string for .subversion/config.


Index: subversion/libsvn_subr/config_file.c
===================================================================
--- subversion/libsvn_subr/config_file.c	(revision 13719)
+++ subversion/libsvn_subr/config_file.c	(working copy)
@@ -1076,6 +1076,8 @@
         APR_EOL_STR
         "### Section for configuring external helper applications."
         APR_EOL_STR
+        "[helpers]"
+        APR_EOL_STR
         "### Set editor to the command used to invoke your text editor."
         APR_EOL_STR
         "###   This will override the environment variables that Subversion"
@@ -1084,30 +1086,28 @@
         APR_EOL_STR
         "###   et al)."
         APR_EOL_STR
+        "# editor-cmd = editor (vi, emacs, notepad, etc.)"
+        APR_EOL_STR
         "### Set diff-cmd to the absolute path of your 'diff' program."
         APR_EOL_STR
         "###   This will override the compile-time default, which is to use"
         APR_EOL_STR
         "###   Subversion's internal diff implementation."
         APR_EOL_STR
+        "# diff-cmd = diff_program (diff, gdiff, etc.)"
+        APR_EOL_STR
         "### Set diff3-cmd to the absolute path of your 'diff3' program."
         APR_EOL_STR
         "###   This will override the compile-time default, which is to use"
         APR_EOL_STR
         "###   Subversion's internal diff3 implementation."
         APR_EOL_STR
+        "# diff3-cmd = diff3_program (diff3, gdiff3, etc.)"
+        APR_EOL_STR
         "### Set diff3-has-program-arg to 'true' or 'yes' if your 'diff3'"
         APR_EOL_STR
         "###   program accepts the '--diff-program' option."
         APR_EOL_STR
-        "[helpers]"
-        APR_EOL_STR
-        "# editor-cmd = editor (vi, emacs, notepad, etc.)"
-        APR_EOL_STR
-        "# diff-cmd = diff_program (diff, gdiff, etc.)"
-        APR_EOL_STR
-        "# diff3-cmd = diff3_program (diff3, gdiff3, etc.)"
-        APR_EOL_STR
         "# diff3-has-program-arg = [true | false]"
         APR_EOL_STR
         APR_EOL_STR
@@ -1199,6 +1199,8 @@
         APR_EOL_STR
         "### Section for configuring automatic properties."
         APR_EOL_STR
+        "[auto-props]"
+        APR_EOL_STR
         "### The format of the entries is:"
         APR_EOL_STR
         "###   file-name-pattern = propname[=value][;propname[=value]...]"
@@ -1211,8 +1213,6 @@
         APR_EOL_STR
         "### is typically done by setting the 'enable-auto-props' option."
         APR_EOL_STR
-        "[auto-props]"
-        APR_EOL_STR
         "# *.c = svn:eol-style=native"
         APR_EOL_STR
         "# *.cpp = svn:eol-style=native"

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] Reformat the template for .subversion/config

Posted by Max Bowsher <ma...@ukf.net>.
Kobayashi Noritada wrote:
> Hi,
>
> This patch reformats the template for .subversion/config
> for convenience of users since they may prefer a configuration item
> immediately following its description.
>
> Thanks,
>
> - nori
>
>
> Log:
> Reformat the template for .subversion/config for convenience of
> users since they may prefer a configuration item immediately
> following its description. Actually most of configuration items
> have already been in that format.
>
> * subversion/libsvn_subr/config_file.c
>  (svn_config_ensure): Tweak a string for .subversion/config.


I think this log message is clearer:

[[[
Reformat the template for .subversion/config for consistency.
Place configuration items immediately following their description.
Most of the configuration items are already in that format.

* subversion/libsvn_subr/config_file.c
  (svn_config_ensure): Tweak .subversion/config template.

Approved by: maxb
]]]

+1, please commit.

Max.

> Index: subversion/libsvn_subr/config_file.c
> ===================================================================
> --- subversion/libsvn_subr/config_file.c (revision 13719)
> +++ subversion/libsvn_subr/config_file.c (working copy)
> @@ -1076,6 +1076,8 @@
>         APR_EOL_STR
>         "### Section for configuring external helper applications."
>         APR_EOL_STR
> +        "[helpers]"
> +        APR_EOL_STR
>         "### Set editor to the command used to invoke your text editor."
>         APR_EOL_STR
>         "###   This will override the environment variables that 
> Subversion"
> @@ -1084,30 +1086,28 @@
>         APR_EOL_STR
>         "###   et al)."
>         APR_EOL_STR
> +        "# editor-cmd = editor (vi, emacs, notepad, etc.)"
> +        APR_EOL_STR
>         "### Set diff-cmd to the absolute path of your 'diff' program."
>         APR_EOL_STR
>         "###   This will override the compile-time default, which is to 
> use"
>         APR_EOL_STR
>         "###   Subversion's internal diff implementation."
>         APR_EOL_STR
> +        "# diff-cmd = diff_program (diff, gdiff, etc.)"
> +        APR_EOL_STR
>         "### Set diff3-cmd to the absolute path of your 'diff3' program."
>         APR_EOL_STR
>         "###   This will override the compile-time default, which is to 
> use"
>         APR_EOL_STR
>         "###   Subversion's internal diff3 implementation."
>         APR_EOL_STR
> +        "# diff3-cmd = diff3_program (diff3, gdiff3, etc.)"
> +        APR_EOL_STR
>         "### Set diff3-has-program-arg to 'true' or 'yes' if your 'diff3'"
>         APR_EOL_STR
>         "###   program accepts the '--diff-program' option."
>         APR_EOL_STR
> -        "[helpers]"
> -        APR_EOL_STR
> -        "# editor-cmd = editor (vi, emacs, notepad, etc.)"
> -        APR_EOL_STR
> -        "# diff-cmd = diff_program (diff, gdiff, etc.)"
> -        APR_EOL_STR
> -        "# diff3-cmd = diff3_program (diff3, gdiff3, etc.)"
> -        APR_EOL_STR
>         "# diff3-has-program-arg = [true | false]"
>         APR_EOL_STR
>         APR_EOL_STR
> @@ -1199,6 +1199,8 @@
>         APR_EOL_STR
>         "### Section for configuring automatic properties."
>         APR_EOL_STR
> +        "[auto-props]"
> +        APR_EOL_STR
>         "### The format of the entries is:"
>         APR_EOL_STR
>         "###   file-name-pattern = propname[=value][;propname[=value]...]"
> @@ -1211,8 +1213,6 @@
>         APR_EOL_STR
>         "### is typically done by setting the 'enable-auto-props' option."
>         APR_EOL_STR
> -        "[auto-props]"
> -        APR_EOL_STR
>         "# *.c = svn:eol-style=native"
>         APR_EOL_STR
>         "# *.cpp = svn:eol-style=native"
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org