Bazaar Workflow

[Philippe Lhoste]

John Arbash Meinel wrote:
> pull and update both apply the upstream changes to your local working
> tree, and move the tip pointer of the branch.
> 
> They *won't*:
> 
> 1) commit anything in your working tree
> 2) handle diverged branches (well, update can, but if you are using a
> checkout, you generally are trying to avoid creating divergence)
> 
> If I was trying to replicate Philippe's P4 working, I would definitely
> use a checkout, and then you would use "bzr up" to bring in the remote's
> changes into your local code. "bzr commit" would then ensure that you
> have the latest, and it would automatically push your latest version
> back to the remote.

OK, I was confused, but further tests confirm (of course!) your 
information. Thanks for correcting me! I soliloquized in an attempt to 
keep accurate information in the thread, but I fear I failed. :-)

That's the price to pay for having the flexibility we have in bzr: one 
must learn the subtle (for me at least!) differences between merge, 
pull, update (an interesting one), etc.

Time to read again the guide and the reference (it is good to redo that 
after a bit of practice, to feel better the workflow).

-- 
Philippe Lhoste
--  (near) Paris -- France
--  http://Phi.Lho.free.fr
--  --  --  --  --  --  --  --  --  --  --  --  --  --