[Svnmerge] [PATCH] Bidirectional merging patch for svnmerge.py

Blair Zajac blair at orcaware.com
Wed Feb 22 11:02:45 PST 2006


Blair Zajac wrote:
> Giovanni Bajo wrote:
> 
>> Blair Zajac <blair at orcaware.com> wrote:
>>
>> Giovanni Bajo wrote:
>> 
>> I'd rather use --verbose only if bidi is active. I'm sure there is a 
>> penalty
>> which is otherwise unnecessary.
> 
> I wouldn't assume as much.  We should see if the client has all the same 
> information from the server, and only changes what to print.  If that's 
> the case, then I'd keep the svnmerge.py code simpler.  If the server 
> changes its response depending upon the svn log flags, then a case could 
> be made to remove the --verbose flag.

So next time I'll check before saying anything :)

Doing an ethereal snoop of an http:// request with -v for svn log does request 
additional information from the server and the server responds.  Without -v, 
there is no changed path information.

Regards,
Blair



More information about the Svnmerge mailing list