Broken branch from svn
Ivan Sagalaev
maniac at softwaremaniacs.org
Sat Oct 31 18:27:37 GMT 2009
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...".
As for locations. The svn repo has somewhat unusual layout:
trunk: lenta-ng/trunk/lenta-ng
branhes: lenta-ng/branches/*
I've pushed the other branch to lenta-ng/branches/bzr/trunk-r499.1.1
(499.1.1 is a bzr revno for that ghost revision).
In my local bzr shared repo I have checkouts of both those branches and
there's no ghost revisions.
A fresh standalone checkout of trunk into a new place also seems to pick
up that revision and has no problems.
> What does "bzr svn-layout" report as the layout that is being used for the Subversion repository?
Will do that on Monday.
>> 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?
Thanks!
More information about the bazaar
mailing list