[Svnmerge] [PATCH] uninit merge tracking (version 3)

[Madan U Sreenivasan]

On Wed, 10 May 2006 18:18:10 +0530, Raman Gupta <rocketraman at fastmail.fm>  
wrote:
[snip]
> Attached v3 of the patch, and new log message:
>
> Add the uninit command, which removes merge tracking information for a  
> given
> head URL. This is useful if multiple heads are being tracked -- without
> uninit, this situation requires the new property value to be manually  
> set by
> the user via svn propset.
>
> * svnmerge.py: Added uninit to command table.
>   (action_uninit): New method for uninitialization of merge tracking  
> info.
>
> * svnmerge_test.py
>   (TestCase_TestRepo.testUninit): New test case.
>   (TestCase_TestRepo.testUninitForce): New test case.
>
> Patch by: Raman Gupta <rocketraman at fastmail.fm>
> Review by: Daniel Rall <dlr at collab.net>
>            Giovanni Bajo <rasky at develer.com>

> +    # If the head-path already has an entry in the svnmerge-integrated
> +    # property, simply error out.
> +    if not branch_props.has_key(opts["head-path"]):
> +        error('"%s" does not contain merge tracking information for  
> "%s"' \
> +                % (opts["head-path"], branch_dir))

      Did you mean...
     # If the head-path does NOT have an entry in the svnmerge-integrated
     # property, simply error out.

or better still...
     # If svnmerge-integrated property does not have an entry for head-path,
     # property, simply error out.


What do you think about a test for presence of multiple heads and absence  
of -S/--head?

Regards,
Madan.