You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/02/02 21:07:43 UTC
svn commit: r1066604 - /subversion/trunk/subversion/svn/main.c
Author: stsp
Date: Wed Feb 2 20:07:43 2011
New Revision: 1066604
URL: http://svn.apache.org/viewvc?rev=1066604&view=rev
Log:
* subversion/svn/main.c
(svn_cl__cmd_table): On Windows, escape the caret in merge help text examples
using the ^/ URL shortcut notation. This is required by cmd.exe.
E.g. 'svn merge ^/trunk' becomes 'svn merge ^^/trunk'
The same could be done for one example in 'svn help switch', but that
would make getopt_test 7 fail and I have no way to run tests on Windows.
Modified:
subversion/trunk/subversion/svn/main.c
Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1066604&r1=1066603&r2=1066604&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed Feb 2 20:07:43 2011
@@ -739,7 +739,11 @@ const svn_opt_subcommand_desc2_t svn_cl_
" branch and run the following command in the top-level directory\n"
" of the working copy:\n"
"\n"
+#ifdef WIN32
+ " svn merge ^^/trunk\n"
+#else
" svn merge ^/trunk\n"
+#endif
"\n"
" The default revision range is -r0:HEAD, so any unmerged changes\n"
" will be merged.\n"
@@ -764,12 +768,20 @@ const svn_opt_subcommand_desc2_t svn_cl_
" branch and run the following command in the top-level directory\n"
" of the working copy:\n"
"\n"
+#ifdef WIN32
+ " svn merge -c50 ^^/trunk\n"
+#else
" svn merge -c50 ^/trunk\n"
+#endif
"\n"
" If several commits to trunk were related to the fix, multiple\n"
" revisions can be merged:\n"
"\n"
+#ifdef WIN32
+ " svn merge -c50,54,60 ^^/trunk\n"
+#else
" svn merge -c50,54,60 ^/trunk\n"
+#endif
"\n"
"\n"
" 2. The second form is called a \"reintegrate merge\":\n"
@@ -810,7 +822,11 @@ const svn_opt_subcommand_desc2_t svn_cl_
" To perform the merge, check out a working copy of the trunk, and run\n"
" the following command in the top-level directory of the working copy:\n"
"\n"
+#ifdef WIN32
+ " svn merge --reintegrate ^^/feature\n"
+#else
" svn merge --reintegrate ^/feature\n"
+#endif
"\n"
" To prevent unnecessary merge conflicts, reintegrate merges require\n"
" that TARGET_WCPATH is not a mixed-revision working copy, has no\n"
@@ -884,14 +900,22 @@ const svn_opt_subcommand_desc2_t svn_cl_
" branch and run the following command in the top-level directory\n"
" of the working copy:\n"
" \n"
+#ifdef WIN32
+ " svn merge ^^/trunk@500 ^^/feature\n"
+#else
" svn merge ^/trunk@500 ^/feature\n"
+#endif
"\n"
" Before performing a 2-UL merge, it is a good idea to preview the\n"
" changes which will be merged, because there is no guarantee that\n"
" the merge will be free of conflicts. The preview can be done with\n"
" the svn diff command:\n"
"\n"
+#ifdef WIN32
+ " svn diff ^^/trunk@500 ^^/feature@HEAD\n"
+#else
" svn diff ^/trunk@500 ^/feature@HEAD\n"
+#endif
"\n"
"\n"
" The following applies to all types of merges:\n"
Re: svn commit: r1066604 - /subversion/trunk/subversion/svn/main.c
Posted by Stefan Sperling <st...@elego.de>.
On Wed, Feb 02, 2011 at 10:15:36PM +0100, Bert Huijben wrote:
>
>
> > -----Original Message-----
> > From: stsp@apache.org [mailto:stsp@apache.org]
> > Sent: woensdag 2 februari 2011 21:08
> > To: commits@subversion.apache.org
> > Subject: svn commit: r1066604 - /subversion/trunk/subversion/svn/main.c
> >
> > Author: stsp
> > Date: Wed Feb 2 20:07:43 2011
> > New Revision: 1066604
> >
> > URL: http://svn.apache.org/viewvc?rev=1066604&view=rev
> > Log:
> > * subversion/svn/main.c
> > (svn_cl__cmd_table): On Windows, escape the caret in merge help text
> > examples
> > using the ^/ URL shortcut notation. This is required by cmd.exe.
> > E.g. 'svn merge ^/trunk' becomes 'svn merge ^^/trunk'
> > The same could be done for one example in 'svn help switch', but that
> > would make getopt_test 7 fail and I have no way to run tests on Windows.
>
> This patch most likely breaks localization of this text and I'm not sure if we should really change the examples to show the quoting. If this is a cmd.exe requirement I don't think we should perform the escaping as there are more ways to run svn than just from cmd.
>
I was thinking of people who copy-paste the examples onto the command
line. I suppose people who aren't using cmd.exe are more likely to know
what they need to type than others.
Well, I had to revert it anyway because it broke the Windows build.
Sorry about the noise.
> Adding some note suggesting the quoting after the main help text might be more appropriate and this would be easier to localize.
Agreed.
Stefan
RE: svn commit: r1066604 - /subversion/trunk/subversion/svn/main.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: stsp@apache.org [mailto:stsp@apache.org]
> Sent: woensdag 2 februari 2011 21:08
> To: commits@subversion.apache.org
> Subject: svn commit: r1066604 - /subversion/trunk/subversion/svn/main.c
>
> Author: stsp
> Date: Wed Feb 2 20:07:43 2011
> New Revision: 1066604
>
> URL: http://svn.apache.org/viewvc?rev=1066604&view=rev
> Log:
> * subversion/svn/main.c
> (svn_cl__cmd_table): On Windows, escape the caret in merge help text
> examples
> using the ^/ URL shortcut notation. This is required by cmd.exe.
> E.g. 'svn merge ^/trunk' becomes 'svn merge ^^/trunk'
> The same could be done for one example in 'svn help switch', but that
> would make getopt_test 7 fail and I have no way to run tests on Windows.
This patch most likely breaks localization of this text and I'm not sure if we should really change the examples to show the quoting. If this is a cmd.exe requirement I don't think we should perform the escaping as there are more ways to run svn than just from cmd.
Adding some note suggesting the quoting after the main help text might be more appropriate and this would be easier to localize.
Bert
RE: svn commit: r1066604 - /subversion/trunk/subversion/svn/main.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: stsp@apache.org [mailto:stsp@apache.org]
> Sent: woensdag 2 februari 2011 21:08
> To: commits@subversion.apache.org
> Subject: svn commit: r1066604 - /subversion/trunk/subversion/svn/main.c
>
> Author: stsp
> Date: Wed Feb 2 20:07:43 2011
> New Revision: 1066604
>
> URL: http://svn.apache.org/viewvc?rev=1066604&view=rev
> Log:
> * subversion/svn/main.c
> (svn_cl__cmd_table): On Windows, escape the caret in merge help text
> examples
> using the ^/ URL shortcut notation. This is required by cmd.exe.
> E.g. 'svn merge ^/trunk' becomes 'svn merge ^^/trunk'
> The same could be done for one example in 'svn help switch', but that
> would make getopt_test 7 fail and I have no way to run tests on Windows.
This patch most likely breaks localization of this text and I'm not sure if we should really change the examples to show the quoting. If this is a cmd.exe requirement I don't think we should perform the escaping as there are more ways to run svn than just from cmd.
Adding some note suggesting the quoting after the main help text might be more appropriate and this would be easier to localize.
Bert