Broken branch from svn

Jelmer Vernooij jelmer at samba.org
Mon Nov 2 14:59:54 GMT 2009


On Mon, Nov 02, 2009 at 05:20:51PM +0300, Ivan Sagalaev wrote:
> Jelmer Vernooij wrote:
> >It will put the new branches in the branches/ directory in the
> >repository, and try to find a good name to use. If available it will use
> >the branch nick that is set on the commits.
> >
> >The configuration option is a boolean that can be set in the global
> >Bazaar configuration, in locations.conf or in ~/.bazaar/subversion.conf.
> 
> Jelmer, hello again!
> 
> I've tried experimenting with push_merged_revisions but with no
> luck. This is what I have in ~/.bazaar/subversion.conf:
> 
> locations = svn+ssh://svn.yandex.ru/lenta-ng
> guessed-layout = trunk0
> branches = branches/bzr/*;trunk/lenta_ng
> tags = tags/*
> push_merged_revisions = True
> 
> The line in "branches" lists branches subdirectory for bzr
> experiments and the trunk. Hope I didn't screw up with this :-).
push_merged_revisions does not work with WildcardLayout yet, as there is 
no easy way to determine the path that bzr-svn should push to. 

We'll need a new  does not work with WildcardLayout yet, as there is 
no easy way to determine the path that bzr-svn should push to. We'll need 
to add another configuration variable and support code in WildcardLayout to 
support this.

Another alternative is to change your repository to use the "standard" layout,
which should work with push_merged_revisions.

Jelmer



More information about the bazaar mailing list