Merging unrelated branches with a multi-parent revision

James Westby jw+debian at jameswestby.net
Mon Feb 2 11:10:41 GMT 2009


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.

Thanks,

James




More information about the bazaar mailing list