bzr-svn fails to push; workflow?

[Jelmer Vernooij]

Hoi Jan,

Jan Nieuwenhuizen wrote:

> I have checked-out a subversion branch in bazaar, did some hacking,
> including some pull updates from subversion.  When I try try to push
> back I get
> 
>     10:04:42 janneke at janneke:~/vc/xxxx.bzr
>     $ bzr push svn+ssh://gforge.natlab.research.flip.com/svnroot/public/samco/branches/xxxx
>     bzr: ERROR: These branches have diverged.  Try using "merge" and then "push".
> 
> Using merge from svn says
> 
>     10:05:10 janneke at janneke:~/vc/xxxx.bzr
>     $ bzr merge svn+ssh://gforge.natlab.research.flip.com/svnroot/public/samco/branches/xxxx
>     Merge phase: ...
>     Nothing to do.
> 
> and push still fails.  I also tried doing a fresh branch from svn, a
> clean pull from the bazaar branch, but I still get this error message.
> It would be so grand if this worked!
This should work and the fact that it doesn't is definitely a bug. Can
you please file one on launchpad? Please also post the output of 'bzr
missing'.

> On http://bazaar-vcs.org/BzrMigration it says
> 
>    .. But it is mainly intended to be used with the following workflow:
>    * bzr branch [...]
>    * bzr merge this branch into a Subversion checkout.
> 
> which suggests that I am using the wrong bzr-svn workflow?  However, I
> do not understand the `bzr merge' step.  How do I bzr merge into a
> directory that has no .bzr repository, is this supposed to work if I
> upgrade svn?
That page is incorrect: working copy support is very much experimental
and the idea is to use Bazaar branches rather than working copies. In
any case, there shouldn't be a lot of restrictions to how you can use
Subversion branches compared to "native" Bazaar branches.

>     10:19:21 janneke at janneke:~/vc
>     $ svn co svn+ssh://gforge.natlab.research.flip.com/svnroot/public/samco/branches/xxxx xxxx.svn
> 
>     10:10:39 janneke at janneke:~/vc/xxxx.svn
>     $ bzr merge ../xxxx.bzr
>     bzr: ERROR: Subversion version too old for working tree support.
> 
> Then I upgraded subversion and python-subversion from feisty to 1.4.3.
> Bzr push still gives `diverged' error and bzr merge says (mangled bzr.log
> attached)
> 
>     11:30:53 janneke at janneke:~/vc/nxpp.svn-1.4
>     $ bzr merge ../scons-merge/
>     generating file id map: ................................................................................................................................................................................
>     bzr: ERROR: libsvn._core.SubversionException: ('Cannot replace a directory from within', 160005)
The working copy (.svn directories) support is still very much
experimental and is waiting for a couple of changes in core bazaar.

Cheers,

Jelmer