bzr pull vs. bzr update

[Karl Fogel]

Juanma Barranquero <lekktu at gmail.com> writes:
> On Thu, Dec 17, 2009 at 00:33, Karl Fogel <karl.fogel at canonical.com> wrote:
>> Yes, I think so -- the point of the trunk mirror is to not diverge.
>
> After
>
>    cd trunk/
>    # whatever changes
>    bzr commit --local -m "local"
>    bzr update
>
> a simple
>
>    bzr commit -m "upstream"
>
> would remove any divergence, wouldn't it?
>
> I mean, if you're taking the trouble to use a checkout to avoid local
> changes and divergences, the fix for any such divergence is not using
> pull, but recommending:
>
>   - using bzr update
>   - *never* doing commit --local
>
> At least, that how I see it.

Hmm.  Honestly, I'm not expert enough at training Bazaar newbies to know
which way is better -- if someone here feels they do know, please just
update http://www.emacswiki.org/emacs/BzrForEmacsDevs as needed.

The answer may be that they're both fine, in which case the page can
just stay as it is.