Comment 12 for bug 332116

On Mon, Feb 23, 2009 at 01:16:58AM -0000, nicholas a. evans wrote:
> On Sat, Feb 21, 2009 at 12:11 AM, Jelmer Vernooij <email address hidden> wrote:
> > you should be able to "downgrade" the trunk to v3 by pulling from svn
> > and specifying an explicit older mapping revision id:

> > $ bzr pull -rrevid:svn-v3-trunk2:0487d25d-142b-0410-8fcf-
> > b82ac621bf97:plugins%2Fspice%2Ftrunk:53035

> Wonderful. That made the merging between trunk and the branch work
> just fine. And after committing that merge (with a svn-v3 parent
> revid), everything works as expected... until I tried to push trunk to
> svn:

> ~/src/mdlogix/spice/trunk $ bzr push :parent
> The svn+ syntax is deprecated, use
> https://svn.mdlogix.com/plugins/spice/trunk instead.
> bzr: ERROR: These branches have diverged. Try using "merge" and then "push".

> Because the svn repo is "using" the v4 mapping now. Perhaps I could
> temporarily downgrade to a version of bzr-svn 0.4.x in order to make
> this commit? Oh well... I'm not going to do that. I'll just "svn rm
> https://svn.mdlogix.com/plugins/spice/trunk && svn copy
> https://svn.mdlogix.com/plugins/spice/{,branches/rails_2_2,trunk}".

See the UPGRADING file in the bzr-svn source tarball; you can set the
mapping that bzr-svn will use for bzr-svn branches by default.

Once InterBranch.push() lands, bzr-svn should also Do The Right Thing
in this situation.

Cheers,

Jelmer