s...@apache.org wrote on Tue, Mar 08, 2011 at 22:51:52 -0000: > Author: stsp > Date: Tue Mar 8 22:51:51 2011 > New Revision: 1079592 > > URL: http://svn.apache.org/viewvc?rev=1079592&view=rev > Log: > * subversion/svn/main.c > (svn_cl__cmd_table): Document foreign repos merges in merge help text. > > 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=1079592&r1=1079591&r2=1079592&view=diff > ============================================================================== > --- subversion/trunk/subversion/svn/main.c (original) > +++ subversion/trunk/subversion/svn/main.c Tue Mar 8 22:51:51 2011 > @@ -893,6 +893,14 @@ const svn_opt_subcommand_desc2_t svn_cl_ > "\n" > " svn diff ^/trunk@500 ^/feature@HEAD\n" > "\n" > + " Note that a 2-URL merge can also merge from foreign > repositories.\n" > + " While SOURCE1 and SOURCE2 must both come from the same > repository,\n" > + " TARGET_WCPATH may come from a different repository than the > sources.\n" > + " However, there are some caveats. Most notably, copies made in > the\n" > + " merge source will be transformed into plain additions in the > merge\n" > + " target, since the copyfrom information is only valid within the\n" > + " source repository.\n"
s/within the source repository/within a single repository/ (or other phrasing that captures the "Doesn't cross repository boundaries" semantics) Also: is "copyfrom information" a user-facing phrase? > + "\n" > "\n" > " The following applies to all types of merges:\n" > "\n" > >
