Bazaar-NG documentation

[Martin Pool]

On 9/1/05, Stefan (metze) Metzmacher <metze at samba.org> wrote:

> why can't bzr pull and bzr push try to do the merge job on the fly?
> svk pull and svk push doesn't care if someone else has commited code.

So what happens if they've committed code to a branch you're trying to
push to?  (It's been a while since i used svk.)  I can imagine it
automatically starting a merge in your local directory.  It doesn't
seem OK to push in an automerge that hasn't been checked by a human.

> I also like the interactive conflict handling, where you will be asked,
> for review the local diff the remote diff, and open an editor to remove conflicts,
> or you can choose to just keep the current file or take the remote file.

So when you do a merge command it asks you for each file what to do?

The basic workflow is the same.  I'm less sure whether the tool should
kind of 'grab hold' of your terminal and make you finish the merge
then and there; I think it's nice if you can leave a resolution in
progress for some time, and do things in the order that suits you.

> And that all with just one simple command, with no large command line to a merge command
> where you need to find out the revision number, relative to each branch...

That shouldn't be necessary in bzr.  It can be useful to work around bugs.

-- 
Martin