[Svnmerge] Phantom revs support done!

[Giovanni Bajo]

Blair Zajac <blair at orcaware.com> wrote:

>> "svnmerge merge"  -->  "svn merge -r20; svn merge -r30:50"   [let's
ignore
>> off-by-one issues]
>> "svnmerge merge -r30-50"  -->  "svn merge -r30:50"
>> "svnmerge merge -r30,50"  -->  "svn merge -r30; svn merge -r50"
>> "svnmerge merge -r30,40,50"  -->  "svn merge -r30:50"
>>
>> Is this OK?
>
> Yes, that works would work great.  Probably makes sense to sort the
> revisions in case somebody says '-r50,40,30' since they may not apply.

In fact, I store and manage revision lists as unsorted sets, so I never
preserve command line's original order. Then, I iterate through an ordered
view of them.

The attached patch implements the above suggestion, reducing the number of
merge operations performed by svnmerge to the bare minimum. I just committed
it.

Thanks for your feedback!
-- 
Giovanni Bajo
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: min_merge_intervals.patch
Url: /pipermail/svnmerge/attachments/20050930/c31dfb62/attachment.txt