More on merge SourceMania back to mercurial

[Chris Mason]

On Saturday 04 June 2005 14:49, Christopher Li wrote:
>
> > Yes. But redoing the diff is likely faster than doing a single extra
> > seek. And merging is not the common case, as you usually will not have
> > to merge a given file. Checkout is much more important.
>
> As I said that before and I said that again. Merging _IS_ the common
> case for distributed SCM. You don't see it as individual developer,
> most of the time you are pulling from the upstream. The high level
> maintainer like Linus, what they do most are merging other people's
> change, often one change set at a time.
>
> A design that penalize merging is just wrong for distributed SCM.
> It is the same reason you want to make sure checkn is fast.

Please provide numbers here.  Always diffing against parent 1 is a major 
change in how the deltas behave and interact with the system, both for 
performance and space savings.

So, what does this change do to mercurial performance (space and speed) and 
how much does it actually help in merging speed?

-chris