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

[Madan U S]

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 at collab.net]
Sent: Thu 4/6/2006 11:54 AM
To: Giovanni Bajo; dev at subversion.tigris.org; svnmerge at 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 <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.

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.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: /pipermail/svnmerge/attachments/20060406/8e269c30/attachment.htm 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: chel-already-inited.txt
Url: /pipermail/svnmerge/attachments/20060406/8e269c30/attachment.txt 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: chel-already-inited.log.txt
Url: /pipermail/svnmerge/attachments/20060406/8e269c30/attachment-0001.txt