Using local Bazaar checkouts from a remote Subversion repository

[Tom Browder]

I think I'm in trouble and I know folks here can set me straight again.

Step 1:  I wanted a local network bzr checkout from a subversion repo
on remote host A.  On local network host B I started a bzr repo:

$ bzr init repodir
$ cd repodir
$ bzr checkout svn+ssh://hostA//path/to/svn/repo repo

Step 2:  On local host C I started another bzr repo:

$ bzr init repodir
$ cd repodir
$ bzr checkout bzr+ssh://hostB//path/to/bzr/repodir repo

Then, on host C, worked happily away:

$ cd repodir
# hack, commit, hack, commit
# all commits accepted on host B

Now I want to go back to host B and commit changes back to the
subversion repo on host A
$ ssh hostB
$ cd repodir
$ bzr update
$ bzt commit
# nothing to commit!!!
# specific attempts to merge back to host A don't work

I think, after step 1 on host B, I should have made a branch of the
bzr/svn checkout and then, in Step 2 on host C, checked out from that
branch.

Note that I never gave any unbind commands, and the remote host A is
normally not available because I have to vpn to it from local host B.

My rationale for my strange setup is that B is my local server and
backup host, and C is my laptop, my primary working device, that must
be able to work off any network.

So two questions, please:

1. How can I recover and get the new stuff from my local network
branch on host B pushed or merged back into the subversion repository
on remote host A?

2. Is there a better solution to my requirements: subversion
repository => bzr repository => bzr repository?

Thanks.

-Tom

Thomas M. Browder, Jr.
Niceville, Florida
USA