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

[Russel Winder]

Jelmer,

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'd recommend just switching over to the new branch and asking people to 
> "bzr pull --overwrite" from the public branches to get the new git-based 
> Bazaar branch.

OK, that works for me even though I said it was a last resort.

Thanks.

(Now just waiting on Bazaar handling internal Git branches ;-)

-- 
Russel.
=============================================================================
Dr Russel Winder      Partner
                                            xmpp: russel at russel.org.uk
Concertant LLP        t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road,   f: +44 8700 516 084   voip: sip:russel.winder at ekiga.net
London SW11 1EN, UK   m: +44 7770 465 077   skype: russel_winder
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100308/90542e43/attachment.pgp