Re: svn commit: r19653 - trunk/contrib/client-side

[Madan U Sreenivasan <ma...@collab.net>]

On Tue, 16 May 2006 17:49:45 +0530, <gi...@tigris.org> wrote:

> Author: giovannibajo
> Date: Tue May 16 05:19:43 2006
> New Revision: 19653
>
> Modified:
>    trunk/contrib/client-side/svnmerge.py
>    trunk/contrib/client-side/svnmerge_test.py
>
> Log:
> Add the uninit command, which removes merge tracking information for a  
> given
> head URL, including blocked revision information. This is especially  
> 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.

I think the following would be better...
(command_table): Added entry for uninit

[snip]
>   (TestCase_TestRepo.getBlockedProperty): New method to get the value
>     of the svnmerge blocked property.

Shouldnt we reuse svnmerge.get_block_props() instead? Pl. find attached  
patch to fix this.

Log for the attached patch:
[[[
Remove redundant function TestCase_TestRepo.getBlockedProperty().
Use svnmerge.get_block_props() instead.

* contrib/client-side/svnmerge_test.py
   (TestCase_TestRepo.getBlockedProperty): Remove redundant function.
   (TestCase_TestRepo.TestUninit): Use svnmerge.get_block_props() instead
    of TestCase_TestRepo.getBlockedProperty().
]]]