using per file merge bases ?

[Aaron Bentley]

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

Aaron Bentley wrote:
| Robert Collins wrote:
| | Hi,
| |     got an interesting bad base selection here:
| |
| | Merging http://bzr.arbash-meinel.com/branches/bzr/storage/;revno=1254
| | into http://people.ubuntu.com/~robertc/baz2.0/storage;revno=1253
|
| Could you post the graph-ancestry output?

Actually, I've done my best to reproduce this:
http://panoramicfeedback.com/opensource/bzr/badbase2.png

This looks a bit like a criss-cross merge, in that there are two
candidate bases:
d0e03, and rR1252.

I'm not sure that picking either one (even on a per-file basis) would
necessarily give a satisfactory merge.  But you'll note that the
selected merge base is not in the revision history of either branch.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDvIg90F+nu1YWqI0RAmybAJ9b+/AcEf3VBJlPpjpkVlXQqjhE3gCaAiyc
iDFx4SQOdDU/0qSVAaQdUow=
=3OFW
-----END PGP SIGNATURE-----