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

[Giovanni Bajo]

Raman Gupta wrote:

>> 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.
>>
>> I am +1 on option 1 (with appropriate documentation in the uninit
>> help).

Agreed.

>> Log message:
>> [...]

Many thanks for going through many iterations! I'm sure this command is
going to be very useful.

Committed as r19653. I slightly fixed and improved the help text (the
positional argument for uninit is the working copy path, not the head).
-- 
Giovanni Bajo