bzr pull vs. bzr update

[Karl Fogel]

John Arbash Meinel <john at arbash-meinel.com> writes:
> If you have *local commits* pull will abort with diverged branches,
> while update will turn your local commits into a merge into the new tip.
> That is the primary difference between pull and update. Both preserve
> working tree changes and allow them to be present.

I was talking about local mods, not local commits, but actually you've
answered my real question: we want 'pull', because the behavior you
describe is what we're recommending for the Emacs dev workflow.

Thanks!