Subversion and branches

[Jelmer Vernooij]

Am Dienstag, den 09.12.2008, 14:53 +0000 schrieb 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.

If the two branches have shared history in Subversion, they should have
shared history in Bazaar. The only case where this doesn't float is if
the two branches are fetched using different branching schemes.

Is this a public repo?

Cheers,

jelmer

-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
Jabber: jelmer at jabber.fsfe.org