Switch to weave merge?

John Yates jyates at netezza.com
Fri May 26 14:07:51 BST 2006


Aaron Bentley wrote:

> Bzr's weave merge requires operations that cannot be cheaply performed
> on a knit.  Specifically, it needs to know about deleted lines.
>
> Knit merge, on the other hand, can be performed at decent speeds on a
> weave, or anything else with cheap annotation.

Under what circumstances do the results diverge?  Is one inherently more
powerful than the other?

/john


More information about the bazaar mailing list