Using bzr-svn to track multiple svn upstream branches

[Jelmer Vernooij]

Am Freitag, den 26.09.2008, 13:04 +0200 schrieb Stefan Bruens:
> Am Thursday 25 September 2008 23:39:45 schrieb Jelmer Vernooij:
> > On Thu, Sep 25, 2008 at 06:29:00PM +0200, Stefan Brüns wrote:
> > > On Thursday 25 September 2008 18:01:31 you wrote:
> > > > On Thu, Sep 25, 2008 at 04:16:05PM +0200, Stefan Br??ns wrote:
> > > > > Unfortunately, it does not work. I am using bzr 1.6.1 and bzr-svn
> > > > > 0.4.12. Upstream SVN is 'Apache/2.0.55 (Ubuntu) DAV/2 SVN/1.3.1'. The
> > > > > project in question is gnuradio.org. Any help would be appreciated.
> > > >
> > > > Please be more specific - what exactly does not work as you expect?
> > >
> > > bzr does not detect the branch is from the same repository as trunk.
> > > After init (--rich-root) I checked out trunk and a branch:
> > > bzr co http://www.gnuradio.org/svn/gnuradio/trunk/ gnuradio-trunk
> > > bzr co
> > > http://www.gnuradio.org/svn/gnuradio/branches/developers/trondeau/dbs/
> > > gnuradio-dbs
> >
> > The second location is not a branch in the standard "branching
> > scheme". You can only use
> > http://www.gnuradio.org/svn/gnuradio/branches/developers
> >
> > (trunk, branches/*, tags/* are supported by the standard branching
> > scheme)
> >
> > bzr-svn >= 0.5 will also support the other location IFF that location
> > and trunk have common history.
> >
> > Hope this helps,
> 
> Thanks for your answers so far, Jelmer. So, as I cant influence upstream 
> branch naming scheme, my only option is to wait for bzr-svn 0.5? May using 
> bzr-svn development version (future 0.5) be an option - is is stable, does it 
> work with bzr 1.6.1?
You can influence the branching scheme in 0.4.x, but changing it is
tricky. Every time you change it, you change the identity of the
revisions created from Subversion. In other words, you want to get it
right the first time.

These restrictions don't exist with trunk (0.5), and trunk will work
with bzr >= 1.6, but it is still rapidly changing and needs more
testing / unit tests. I wouldn't recommend using it for production use
yet.

> A different idea - is it possible to tweak the list of branch locations you 
> mentioned on my local installation to also include a few more "search" 
> locations, so in my case additionally to e.g. branches/* also 
> branches/developers/trondeau/* ?
bzr svn-branching-scheme --set <repos-root-url>

But please keep the restrictions mentioned above in mind.

Cheers,

Jelmer

-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
Jabber: jelmer at jabber.fsfe.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 315 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080929/b540a069/attachment-0001.pgp