You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Giovanni Bajo <ra...@develer.com> on 2006/04/05 21:53:57 UTC
Re: [Svnmerge] [PATCH] svnmerge.py: Add check for already init-ed head
Madan U S <ma...@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
Re: RE: [Svnmerge] [PATCH] svnmerge.py: Add check for already init-ed head
Posted by David James <dj...@collab.net>.
On 4/6/06, Madan U S <ma...@collab.net> wrote:
> Pl. find attached the patch with the --force option change.
>
> [[[
> 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 check is skipped on using the --force
> option.
> ]]]
Thanks Madan. Applied in r19316 with a few minor formatting tweaks.
Cheers,
David
--
David James -- http://www.cs.toronto.edu/~james
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: RE: [Svnmerge] [PATCH] svnmerge.py: Add check for already init-ed head
Posted by Madan U S <ma...@collab.net>.
Pl. find attached the patch with the --force option change.
[[[
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 check is skipped on using the --force
option.
]]]
Regards,
Madan.
PS : Apologize for top-posting.
-----Original Message-----
From: Madan U S [mailto:madan@collab.net]
Sent: Thu 4/6/2006 11:54 AM
To: Giovanni Bajo; dev@subversion.tigris.org; svnmerge@orcaware.com
Subject: RE: [Svnmerge] [PATCH] svnmerge.py: Add check for already init-ed head
On Thursday 06 Apr 2006 3:23 am, Giovanni Bajo wrote:
> Madan U S <ma...@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.
oh, no. If it is meant to be used like that, it should not be called 'init'.
Maybe 'sync' or 'integrate'?
> At the very least, you should make --force override this check.
agree.
> 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.
Revert may not be possible in some cases, given the other user changes.
I'd rather like the command failing with a message saying 'Use --force to
force this operation'.
Regards,
Madan.
RE: [Svnmerge] [PATCH] svnmerge.py: Add check for already init-ed head
Posted by Madan U S <ma...@collab.net>.
On Thursday 06 Apr 2006 3:23 am, Giovanni Bajo wrote:
> Madan U S <ma...@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.
oh, no. If it is meant to be used like that, it should not be called 'init'.
Maybe 'sync' or 'integrate'?
> At the very least, you should make --force override this check.
agree.
> 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.
Revert may not be possible in some cases, given the other user changes.
I'd rather like the command failing with a message saying 'Use --force to
force this operation'.
Regards,
Madan.