Subversion and branches

[Russel Winder]

On Tue, 2008-12-09 at 15:01 +0100, Jelmer Vernooij wrote:
> Am Dienstag, den 09.12.2008, 11:44 +0000 schrieb Russel Winder:
> > I know I should know the answer to this but...
> > 
> > Using Git I can do:
> > 
> > 	git svn clone -T trunk -b branches <some Subversion repository URL>
> > 
> > and the clone has all the information about the trunk and its branches.
> > 
> > Clearly with Bazaar, step 1 is:
> > 
> > 	bzr init-repo --rich-root-pack SharedRepository
> > 	cd SharedRepository
> > 
> > but now if I just pull the two branches, Bazaar doesn't know that they
> > are actually connected.
> If you pull in branches this way by running "bzr branch ..." inside of
> SharedRepository, bzr *will* see the two branches are connected.

OK, cool.  I will try it...  According to qlog, Bazaar brings in two
distinct and disconnected branches.

I have no idea if this is correct or even expected behaviour but Git
just pulls the trunk and the branches as distinct and disconnected
branches.  If however you then rebase a branch to trunk in Git then
everything about interacting with the Subversion repository goes a
little bit haywire.  In particular the local branch gets bound to
remote/trunk which really ruins things.

Bazaar refuses to undertake the rebase -- one up to Bazaar.

I wonder if the branch point got lost in the Subversion repository...

> Actually, the equivalent to that git command above would just be:
> 
> bzr svn-import <some svn repository url>

I have never tried that, I must have a play.

Thanks.

-- 
Russel.
====================================================
Dr Russel Winder                 Partner

Concertant LLP                   t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road,              f: +44 8700 516 084
London SW11 1EN, UK.             m: +44 7770 465 077
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20081209/759dd5c5/attachment.pgp