Notes from Bazaar sprint, Tuesday

[Martin Pool]

2009/11/24 James Westby <jw+debian at jameswestby.net>:
>>  * Combine branches without shared history
>
> Was there any discussion of this part?

Yes, some.  It is essentially about looking at handling some parallel
import situations pragmatically.  Ideas include:

 * doing a merge that ignores file id changes and just matches up by name
 * ... especially in the case of a cherrypick to bring in the changes
you want without worrying about old history
 * the same thing as part of a rebase operation
 * possibly falling back to a two-way merge automatically when no
common base can be detected

-- 
Martin <http://launchpad.net/~mbp/>