[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r29883 - trunk/subversion/svn

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Wed, 12 Mar 2008 14:10:42 -0700

Daniel L. Rall wrote:
> Needs a backport to 1.5.x? If so, +1 from me.

Yup. Added (with your vote) in r29885.

> On Wed, 12 Mar 2008, hwright_at_tigris.org wrote:
>
>> Author: hwright
>> Date: Wed Mar 12 12:15:40 2008
>> New Revision: 29883
>>
>> Log:
>> * subversion/svn/main.c
>> (svn_cl__cmd_table): Follow up to r29763 by updating the 'svn merge' help
>> text.
>>
>>
>> Modified:
>> trunk/subversion/svn/main.c
>>
>> Modified: trunk/subversion/svn/main.c
>> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/main.c?pathrev=29883&r1=29882&r2=29883
>> ==============================================================================
>> --- trunk/subversion/svn/main.c (original)
>> +++ trunk/subversion/svn/main.c Wed Mar 12 12:15:40 2008
>> @@ -586,7 +586,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
>> ("Apply the differences between two sources to a working copy path.\n"
>> "usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
>> " 2. merge sourceWCPATH1_at_N sourceWCPATH2_at_M [WCPATH]\n"
>> - " 3. merge [[-c M]... | [-r N:M]...] [SOURCE[@REV] [WCPATH]]\n"
>> + " 3. merge [[-c M[,N]]... | [-r N:M]...] [SOURCE[@REV] [WCPATH]]\n"
>> "\n"
>> " 1. In the first form, the source URLs are specified at revisions\n"
>> " N and M. These are the two sources to be compared. The revisions\n"

Received on 2008-03-12 22:11:13 CET

This is an archived mail posted to the Subversion Dev mailing list.