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

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

From: Senthil Kumaran S <senthil_at_collab.net>
Date: Thu, 17 Apr 2008 13:03:10 +0530

Hi Fabien,

fabien_at_tigris.org wrote:
> [[ $previous = '--accept' ]] && \
> {
> - # the list is reduced for 'resolved'
> - if [[ $cmd = 'resolved' ]] ; then
> - values='base mine theirs'
> + # the list is different for 'resolve'
> + if [[ $cmd = 'resolve' ]] ; then
> + # from svn help resolve
> + values='mine working mine-full theirs-full'

There is no value called 'mine' in 'svn help resolve'. It should be 'base'.

> + # 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).

> + fi

The attached patch corrects the above.

[[[
Follow up to r30643.

* tools/client-side/bash_completion
   (): Tweak the values for --accept and do not stop just with --accept option
    for 'svn resolve' command.

Patch by: stylesen
]]]

-- 
Senthil Kumaran S
http://www.stylesen.org/


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

Received on 2008-04-17 09:33:31 CEST

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