using per file merge bases ?

[John Arbash Meinel]

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
> 
> 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
> 

Well, the idea of weave merge was that it would be able to do in essence
a per-line ancestry selection.

Certainly an interesting in-between would be to determine ancestry for
each file.

I'm really surprised that it conflicted, considering I should only be a
descendant of yourself.

But actually, what probably happened is that we both merged your
integration branch (I did it by merging my jam-integration branch). And
because of Aaron's "Longest Path from Root", the integration branches
have more history than the storage branches, thus get preferentially
selected for merge bases.

(So we got rid of shortcut branches to get long-cut branches instead :)

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060104/7f4c228c/attachment.pgp