[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge tracking proposal

From: Daniel Berlin <dberlin_at_dberlin.org>
Date: 2006-05-07 20:32:09 CEST

> > However, there is simply nothing you can do about this.
>
> On the contrary, the person who talked about 'svnmerge.py' said that it was
> able to reduce lists like "1,2,3,4,5" to ranges like "1-5" and even do the same
> for lists with gaps where the missing revision numbers were irrelevant to the
> target.

We must be talking past each other.

Certainly, you can minimize the length in terms of making sure
continuous numbers are merged into ranges (and in fact, our
implementation will try), i've simply not made it *required* in the
design, because i haven't estimated the performance impact yet. If it
turns out to be minimal performance impact, i probably will modify the
design to make it required of all implementations that touch merge
tracking info.

The reason I said "there is simply nothing you can do about this" in
reference to the length of the lists as the number of merges grows
large. No matter how much you minimize, there is always a worst case
that will make the lists large. For example, merging every 3rd revision
would produce lists that can't be minimized.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun May 7 20:33:50 2006

This is an archived mail posted to the Subversion Dev mailing list.