On Wed, 12 Apr 2006, Madan S. wrote:
...
> [[[
> Make (multiple heads present)error message more informative.
>
> * contrib/client-side/svnmerge.py
> (get_default_head): Modified to make the error message
> more informative by listing the available heads.
> ]]]
> Index: contrib/client-side/svnmerge.py
> ===================================================================
> --- contrib/client-side/svnmerge.py (revision 19318)
> +++ contrib/client-side/svnmerge.py (working copy)
> @@ -765,8 +765,13 @@
> del props[directory]
>
> if len(props) > 1:
> - error('multiple heads found. '
> - 'Explicit head argument (-S/--head) required.')
> + err_msg = 'multiple heads found. '
> + err_msg += 'Explicit head argument (-S/--head) required.\n'
> + err_msg += 'The head values available are:'
> + repo_root = get_repo_root(branch_dir)
> + for prop in props:
> + err_msg += '\n ' + repo_root + prop
> + error(err_msg)
>
> return props.keys()[0]
Committed in r19338.
--
Daniel Rall
- application/pgp-signature attachment: stored
Received on Thu Apr 13 02:10:08 2006