Re: svn commit: r30643 - trunk/tools/client-side

Dear Senthil,

>> + values='mine working mine-full theirs-full'
>
> There is no value called 'mine' in 'svn help resolve'. It should be 'base'.

Indeed.

>> + # force mandatory --accept option for 'resolve' command
>> + if [[ $cmd = 'resolve' && ! $acceptOpt ]]
>> + then
>> + COMPREPLY=( $( compgen -W '--accept' -- $cur ) )
>> + return 0
>
> We should not return here, since --accept is not the only option, there are
> others to be considered (ie, the $pOpts and others).

This return is really intentional, as --accept is currently mandatory, at
least as suggested by the "svn help" on trunk. Thus the option is forced,
but once provided other options are available to the completion.

It is the same with revision properties, for instance try:

         shell> svn pedit svn:log <TAB> <TAB>

To get both mandatory options for --revprop and --revision, and then the
other ones are available.

-- 
Fabien.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org