using per file merge bases ?

[Aaron Bentley]

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

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?

| It conflicts on a bunch of 'newly added files' - which both branches
| have, and both have common history for.
|
| I keep coming back to the idea of selecting bases for each thing that is
| different from that things ancestry rather than from the graph of
| revisions as a whole.

So if they both have the same newly-added files, doesn't that mean they
both have the revision that added them?  And so, shouldn't that be
selected as the base?

| Does that make sense?

To me, it suggests a flaw in our base selection algorithm.  But if it
produces better results, great.  All the pieces you need to do that
should be there already.

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

iD8DBQFDvH8D0F+nu1YWqI0RAjkJAJ9KqUfJml+Qe6h2uS5m/4DAr+uODACdHwer
W1ug1mcY07UhkF3fL2sNOWY=
=T41O
-----END PGP SIGNATURE-----