No subject

checkout is with "bzr update", which will merge the upstream changes
with any pending change in trunk/. With the workflow above the
difference is not relevant, because trunk/ is never going to have
changes, but I can also imagine doing this

      cd $DEVHOME/emacs/trunk/
      bzr merge ../quickfixes
      # oops, I forgot to update
      bzr update
      # resolve any conflict, then
      bzr commit -m "Merge: fix bla bla bla (closes Bug #1)."

where "bzr pull" would force me to do a revert-and-merge-again.

Also, when there are no changes upstream or on the wc, update seems
way faster than pull, at least over SFTP.

I asked Karl why he recommended pull, and he said:

   Just because 'bzr pull' is what I always use? :-)

and

  Oh, we've asked the experts.  Depending on which expert you ask, you get
  a different answer.  Welcome to Bazaar :-).

Then he recommended that I brought the issue here. Which I'm doing :-)

So, which is the True Way in this case? Or did I misunderstood everything?

    Juanma