questions from a new bzr user

[Erik Bågfors]

On 5/5/06, Erik Bågfors <zindar at gmail.com> wrote:
> On 5/5/06, Ramon Diaz-Uriarte <rdiaz02 at gmail.com> wrote:
> > Dear All,
> >
> > I've recently started using bzr, after considering several other
> > options (some of my tribulations and reasons for choice are listed at
> > http://ligarto.org/rdiaz/VersionControl.html). bzr is a very nice
> > piece of software, and is actually quite enjoyable to use!!!
> >
> >
> > I have, however, a couple of questions for which I can find no answer:
> >
> > 1. I have a "central repository" in a server, and then do my work on,
> > say, a laptop. Other colleagues might be doing the same. Now, I'd like
> > to store my changes in the server. As my colleagues might have been
> > editing the same files, I use merge, not push. However, to use merge I
> > need to log into the server, and do a merge from there. Is there a way
> > to do the merge (going from my laptop to the server) issuing the
> > command from my laptop?
>
> The normal way to do it, is to have a checkout on your laptop (from
> the branches on the server), then you merge into that checkout. That
> will have the wanted effect.
>
> So, basically
> bzr checkout sftp://user@server/path/to/branch serverbranch
> cd serverbranch
> bzr merge ../laptopbranch
> bzr commit -m 'merge from laptop branch'
>
> Now and then, you might get a message saying that you need to run "bzr
> update", then you... run "bzr update" before the merge

Answering my own mail, to add one more thing.

Another way to do it is this

bzr checkout sftp://user@server/path/to/branch serverbranch
cd serverbranch
# hack hack hack
bzr commit --local
# hack hack hack
bzr commit --local
# Repeat

Now when you want to merge this into the branch on the server, run
bzr update
bzr status
# check bzr status, and you'll see that your changes are merged in
# resolve any conflicts
bzr commit -m 'commit local changes'

/Erik