Author: stsp
Date: Sun Jun 12 14:56:11 2011
New Revision: 1134932
URL: http://svn.apache.org/viewvc?rev=1134932&view=rev
Log:
* subversion/svn/main.c
(svn_cl__cmd_table): Document in 'svn help merge' that all types of
merges now require uniform-revision working copies.
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=1134932&r1=1134931&r2=1134932&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Sun Jun 12 14:56:11 2011
@@ -888,6 +888,11 @@ const svn_opt_subcommand_desc2_t svn_cl_
"\n"
" The following applies to all types of merges:\n"
"\n"
+ " To prevent unnecessary merge conflicts, svn merge requires that\n"
+ " TARGET_WCPATH is not a mixed-revision working copy.\n"
+ " Running 'svn update' before starting a merge ensures that all\n"
+ " items in the working copy are based on the same revision.\n"
+ "\n"
" For each merged item a line will be printed with characters
reporting\n"
" the action taken. These characters have the following meaning:\n"
"\n"
