Merging unrelated branches with a multi-parent revision

[Jelmer Vernooij]

On Mon, Feb 02, 2009 at 11:10:41AM +0000, James Westby wrote:
> On Fri, 2009-01-30 at 19:55 +0100, Jelmer Vernooij wrote:
> > Is this what you are looking for:

> > $ bzr merge -r0..-1 <other-branch-url>

> I was under the impression that this would not create a
> multi-parent revision, and so would not allow normal merges
> to be done in the future. What I am looking for is to create
> shared revision history where none currently exists.

This will create a multi-parent revision and will allow normal merges
to be done in the future (in other words no "These branches are
unrelated" error).

Cheers,

Jelmer

-- 
Jelmer Vernooij <jelmer at samba.org> - http://jelmer.vernstok.nl/