subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1066633 - /subversion/trunk/subversion/svn/main.c
Date Wed, 02 Feb 2011 21:28:28 GMT
Author: stsp
Date: Wed Feb  2 21:28:28 2011
New Revision: 1066633

URL: http://svn.apache.org/viewvc?rev=1066633&view=rev
Log:
Rervert r1066604 to unbreak the windows build.
The Windows C preprocessor can't expand macros within macros.

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=1066633&r1=1066632&r2=1066633&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed Feb  2 21:28:28 2011
@@ -739,11 +739,7 @@ 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"
@@ -768,20 +764,12 @@ 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"
@@ -822,11 +810,7 @@ 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"
@@ -900,22 +884,14 @@ 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"



Mime
View raw message