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

[Raman Gupta]

Madan U Sreenivasan wrote:
> Another question I have been wanting to ask(I have not thought this 
> through): Isn't handling svnmerge-blocked necessary here?

I think you're right. Block has its own "unblock" command, so there are
two options:

1) Have uninit remove the blocked property as well as the merge property.

2) Have uninit error out, telling the user that there are blocked revisions
and that unblock must therefore be executed first.

The advantage of 1 is that it is more intuitive and easier, and that it
can be done in one commit (without using --force on uninit). The advantage
of 2 is that it forces the user to understand the ramifications of what
they are doing as well as bettor mirroring the init/block commands.

I am +1 on option 1 (with appropriate documentation in the uninit help).
I have attached patch v4 with Daniel's and Madan's latest comments, plus
option 1 implemented above.

Log message:

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.

* svnmerge_test.py
  (TestCase_TestRepo.testUninit): New test case, checking that uninit works.
  (TestCase_TestRepo.testUninitForce): New test case.
  (TestCase_TestRepo.getproperty): Prevent array index errors when
    retrieving a property with no value.
  (TestCase_TestRepo.getBlockedProperty): New method to get the value
    of the svnmerge blocked property.

Patch by: Raman Gupta <rocketraman at fastmail.fm>
Review by: Daniel Rall <dlr at collab.net>
           Madan U Sreenivasan <madan at collab.net>
           Giovanni Bajo <rasky at develer.com>

Cheers,
Raman

-------------- next part --------------
A non-text attachment was scrubbed...
Name: uninit_v4.patch
Type: text/x-patch
Size: 7150 bytes
Desc: not available
Url : /pipermail/svnmerge/attachments/20060513/ed8f6186/attachment.bin