[Svnmerge] [PATCH] Bidirectional patch take 2

[Blair Zajac]

Raman Gupta wrote:
> Blair Zajac wrote:
> 
> Some very small nits:
> 
> 
>>+    when doing bidirectional merging between branches).
>>+    Return a tuple of three RevisionsSet's:
> 
>                                        ^
> Extra s -------------------------------+

Fixed.

>>+    log_opts = '--quiet -r%s:%s "%s"' % (begin, end, url)
>>+    if opts["bidirectional"]:
>>+        log_opts = '--verbose ' + log_opts
>>+    lines = launchsvn('log %s' % log_opts)
> 
>                          ^      ^
> Most of the program seems to use double-quotes, but I'm not sure if
> there any applicable community standards here.

Yes, I prefer single quotes myself.  However, I made the change to the other lines.

The line with the enclosed double-quotes of course needs the single quotes, 
unless we want \".

>>+        report("checking for reflected changes in %s revision(s)"
>>+               % len(potential_reflected_revs))
> 
> 
> I know this was in my original patch but this should probably be %d
> revisions(s).

Changed.  Most of the time I always see %s though, just as it's easier.

Regards,
Blair