Broken branch from svn

[Jelmer Vernooij]

On Sat, 2009-10-31 at 21:27 +0300, Ivan Sagalaev wrote:
> Jelmer Vernooij wrote:
> >> - No trunk happily sees that lost revision in a shared repo.
> > What location did you push the other branch to exactly? Does "bzr log" on the remote Subversion repository report the merged revisions?
> I've just noticed my typo. I meant to write "No_w_ trunk happily sees...".
Ah, thanks.

> >> What should we do to not repeat the problem? As far as I understand now 
> >> any local branches merged into a checkout of svn trunk will produce 
> >> ghost revisions for other people's checkouts. Right?
> > Not necessarily - you can set the 'push_merged_revisions' option to
> > "True" to make bzr-svn always push right hand side revisions that are
> > missing from the repository.
> 
> Looks like what we need. Two questions then: in which config to put this 
> option and where in the svn repo will it place merged revisions?
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.

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: 836 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20091101/13d61456/attachment.pgp