current merge base selection less-than-ideal?
Robert Collins
robertc at robertcollins.net
Thu Oct 4 23:10:03 BST 2007
Hi Aaron, I think we are selecting inappropiate merge base points.
In my branch at http://people.ubuntu.com/~robertc/baz2.0/repository I
just committed a merge from bzr.dev that had many inappropriate
conflicts - where for entire files I was taking the merge source
version.
revision-id: robertc at robertcollins.net-20071004220007-6tb7pyeknkhpnfyq
parent: robertc at robertcollins.net-20071003084403-e8j4dft472ww2ucv
parent: pqm at pqm.ubuntu.com-20071004174812-z1zg35r1vssltydl
find-merge-base claims it would have used:
pqm at pqm.ubuntu.com-20070823005013-ada9x55rc31yiwou
Which is back before 10 other merges of bzr.dev - all of which would
have reduced the conflicts.
Any thoughts?
-Rob
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071005/c744c117/attachment.pgp
More information about the bazaar
mailing list