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

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

From: Giovanni Bajo <rasky_at_develer.com>
Date: 2006-04-05 23:53:57 CEST

Madan U S <madan@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

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Apr 5 23:54:23 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.