[RFC] Use KnitVersionedFile.plan_merge for all VersionedFiles

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Aaron Bentley wrote:
> Hi all,
> 
> For knit-format branches, "--merge-type weave" actually performs a knit
> merge.  The behaviour of knit merge and weave merge is very similar, but
> there are some small differences.  In principle, I think it would be
> surprising to have merge behave differently depending on your repository
> storage format.
> 
> The knit plan_merge is implemented in terms of the public VersionedFile
> API, so it can support any VersionedFile, including weaves.  So I
> propose turning it into VersionedFile.plan_merge, and removing
> Weave.plan_merge.
> 
> If there was value remaining in weave merge, we could examine the
> possibility of having both weave merge and knit merge.  But I don't
> believe there's enough difference between weave merge and knit merge to
> make that worthwile.
> 
> Aaron

I also think we are deprecating weaves in the general sense. (Not
support for them, just not recommending them for future work.)

I think the biggest advantage of weave merge is that it remembers
deleted lines. Which can act as a synchronization point. However, I
agree that it is probably better to be consistent with our merge algorithm.

So I agree that we should switch a common merge algorithm.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEt6z5JdeBCYSNAAMRAq01AJwPa7Q+3IVjHSQltnf/e3eflfL2FACcDW5g
NisU7tqDun/iwlcwHMGDKBs=
=+ftY
-----END PGP SIGNATURE-----