using per file merge bases ?

[Robert Collins]

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

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.

Does that make sense?

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/20060105/a1847230/attachment.pgp