Possibly Dumb Question about Switching a Bazaar Branch from Subversion to Git

[Jelmer Vernooij]

Hi Russel,

On 03/08/10 14:44, Russel Winder wrote:
> On Mon, 2010-03-08 at 14:23 +0100, Jelmer Vernooij wrote:
> [ . . . ]
>    
>> There is no common history here, so there isn't much that can be done.
>> You could do a "bzr merge -r0..-1" to force a merge but you would get a
>> lot of file conflicts because the files have no common ancestry.
>>      
> Sad but I do understand -- it's just that I *know* the histories in the
> two cases are identical, so it is a bit frustrating that the tools have
> no way of dealing with this.
>    
I agree. Unfortunately we don't have a good story for parallel imports 
(yet).

> (Now just waiting on Bazaar handling internal Git branches ;-)
>    
We call them colocated branches :-)

Cheers,

Jelmer