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

[Raman Gupta]

Giovanni Bajo wrote:
> Raman Gupta wrote:
> 
>> Giovanni Bajo wrote:
>>> Raman Gupta <rocketraman at fastmail.fm> wrote:
>>>
>>>>> +
>>>>> +    branch_props.pop(opts["head-path"])
>>> With "del" here instead of pop, you get a +1 from me.
>> Hmm, del doesn't seem to work:
>>
>> $ ./svnmerge_test.py
>> Traceback (most recent call last):
>>   File "./svnmerge_test.py", line 25, in ?
>>     import svnmerge
>>   File "/home/raman/svn-client-side/svnmerge.py", line 1205
>>     branch_props.del(opts["head-path"])
>>                    ^
>> SyntaxError: invalid syntax
> 
> del branch_props[opts["head_path"]]

Ahh, ok. I knew there had to be a way to do it without popping, but
I was looking for methods on dictionary objects. Thanks.

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>

Cheers,
Raman
-------------- next part --------------
A non-text attachment was scrubbed...
Name: uninit_v3.patch
Type: text/x-patch
Size: 4363 bytes
Desc: not available
Url : /pipermail/svnmerge/attachments/20060510/3b03bf86/attachment.bin