Switch to weave merge?
John Arbash Meinel
john at arbash-meinel.com
Thu May 25 20:23:24 BST 2006
We decided that in post 0.8 we would switch to Patience diff so that we
can give it a workout, and shakedown before we release 0.9. Do we want
to switch to having weave merge be the default format for the same reason?
My understanding for weave merge is that it succeeds in a lot of places
'merge3' would fail, but when it fails it has a harder time recovering.
(Or at least we humans don't understand the failure as well).
I just wanted to bring up the discussion again.
John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060525/054b6b2d/attachment.pgp
More information about the bazaar
mailing list