bzr-svn 0.3
Jelmer Vernooij
jelmer at samba.org
Fri Feb 9 16:33:35 GMT 2007
On Fri, 2007-02-09 at 17:14 +0100, Wouter van Heyst wrote:
> On Fri, Feb 09, 2007 at 03:51:13PM +0100, Nicholas Allen wrote:
> > I didn't realise that bzr-svn could be extended to support different svn
> > layout schemes. So I thought the only way to do what we want was a
> > partial svn checkout of the trunk. But if it is possible to define a new
> > scheme so this no longer considered a partial checkout then that would
> > be very cool ;-)
> That should be possible, and after the sprint Jelmer might even be
> convinced it's a good idea. Jelmer, what are the plans in this
> direction?
Yeah, I should probably give an update on this.
So, initially I was convinced that supporting custom branching schemes
was a bad idea. I still don't like the idea very much (bzr-svn "just
works" for the existing stuff at the moment, no need to set custom
properties in the repository to support it), but I no longer see a lot
of problems supporting them after talking to Robert at the sprint.
The idea is to add support for custom branching schemes to the 0.4
branch. There would be two ways to set custom branching schemes: using a
magic property in the repository root and in the users' locations.conf
(or maybe a svn.conf or something).
Bug #766145 describes this feature. I've recently changed the
description to:
It should be possible to override the current branching scheme for a
repository by putting a list of branches (or branch parents) somewhere
in the root of that repository.
The unique identity of this file should be reflected in the revision ids
that are generated when using the branching scheme based on this file.
Perhaps the checksum of a whitespace-stripped copy of this file?
The last version of this file in the repository is always used, even for
revisions in the past. The consequence of this is that changing this
file may break the ability to use old revisions (just like would be the
case when upgrading the mappings, which would break existing revision
ids).
This requires significant changes since it requires the branching scheme
to be known when revision ids are generated.
Proposed property to set on the repository root URL:
``bzr:branching-scheme''. The property will consist of a
newline-seperated list of branch parent paths. The "*" wildcard can be
used to indicate all names on the specified level.
whitespace will be stripped. Comments can appear on any line, prepended
with a # character.
The sha1 of the whitespace- and comment-stripped version of this file
will be made part of the revision id.
Example property contents for Samba:
tags
branches
branches/tmp
Another example, for the mono repository:
trunk/*
tags/1.2.3/*
If you're interested in helping getting this feature implemented, please
let me know. It'd probably be a good idea to get a spec written about
this, so we can both agree on how exactly this would be implemented
before continuing.
Cheers,
Jelmer
--
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 307 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070209/0864f8fc/attachment-0001.pgp
More information about the bazaar
mailing list