[Svnmerge] [PATCH] svnmerge.py: Add check for already init-ed head

Giovanni Bajo rasky at develer.com
Wed Apr 5 14:53:57 PDT 2006


Madan U S <madan at collab.net> wrote:

> [[[
> Add check for already initialized head.
>
> * contrib/client-side/svnmerge.py
>   (action_init): Modified to print error message and exit,
>   when the branch provided has already been initialized for
>   the given head.
> ]]]


This is commonly used to "reset" the merge status after some confusing
commands. At the very least, you should make --force override this check. I'd
be more satisfied if you just printed a warning and let the operation continue:
the user can easily revert the command after the fact if he wants to.

Giovanni Bajo




More information about the Svnmerge mailing list