Using local Bazaar checkouts from a remote Subversion repository
Tom Browder
tom.browder at gmail.com
Tue Oct 19 20:11:28 BST 2010
On Tue, Oct 19, 2010 at 11:39, Tom Browder <tom.browder at gmail.com> wrote:
> On Tue, Oct 19, 2010 at 10:58, John Szakmeister <john at szakmeister.net> wrote:
>> On Tue, Oct 19, 2010 at 11:10 AM, Tom Browder <tom.browder at gmail.com> wrote:
>>> I think I'm in trouble and I know folks here can set me straight again.
> ...
John, thanks, great blogs. I had seen them early on and didn't know
enough then to realize the impact of what you said. I also found that
I was wrong about the binding issue. As a consequence I am starting
over and including my corrections after the fact as I think I now have
a working solution.
A recap of my original situation:
repo 1: subversion repo on remote host A (accessed via vpn to company network)
note that repo 1 is the master source repository (and it is backed
up onto multiple disks with svn hotcopy)
repo 2: bzr repo on local network host B, checked out from repo 1
repo 3; bzr repo on local network host C, checked out from repo 2
The fundamental original question was how to update repo 1 from repo 2?
One point I didn't make earlier was that I am the major user of that
company subversion repo (actually a subversion branch) and no one will
likely be using it, so I essentially have complete control--i.e.,
there should be no merge surprises).
After John's questions, I went back and did experiments where I added
new files in the working trees on all the hosts, changed bindings, and
generally mucked around to see how I could get it all to work for my
weird (but I suspect not unheard of) work flow.
My working concept of operations now is this:
1. Normal operations:
repo 2 is unbound
I work in repo 3 (my laptop, at home) which stays bound to repo 2 on
my home network and commits are done regularly
repo2 is backed up periodically by pulling into backup repos on host B
(from System Admin Guide, using bzr as its own backup)
periodically on host B I will rebind repo2 to repo 1, update repo2 and
commit pending merges to repo 1, then unbind repo 2 again
2. Mobile operations (work on laptop while away from my network as
well as the company network):
I work in repo 3 (my laptop, on the road) which normally stays unbound
periodically I will rebind repo3 to repo 1 (a change in parent!),
update repo3 and commit pending merges to repo 1, then unbind repo 3
3. Return to home network from a road trip
rebind repo 3 to repo 2, update and commit
bind repo 2 to repo 1, update and commit, unbind repo 2
return to normal operations [1]
More information about the bazaar
mailing list