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

Madan U Sreenivasan madan at collab.net
Wed May 10 11:14:54 PDT 2006


On Wed, 10 May 2006 22:22:04 +0530, Daniel Rall <dlr at collab.net> wrote:

> On Wed, 10 May 2006, Raman Gupta wrote:
>
>> Madan U Sreenivasan wrote:
> ...
>> > What do you think about a test for presence of multiple heads and
>> > absence of -S/--head?
>>
>> Isn't that handled already by the options parsing code?
>
> main() seems to have some checking for the presense of head.


/me nods... thats right... -S/--head check happens before invokation of  
cmd() (the condition starting at at line 1828 as of r19599)
so its already handled.

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


Regards,
Madan.




More information about the Svnmerge mailing list