Comment 5 for bug 175589

On Sun, Apr 05, 2009 at 09:23:19PM -0000, Robert Collins wrote:
> On Sun, 2009-04-05 at 13:32 +0000, Wouter van Heyst wrote:
> > Bug #113809 is part of it, but imho that is not the main cause (and thus
> > no duplicate).
> >
> > That `bzr update` in a checkout which hasn't diverged, just has extra
> > revisions, pivots the local revisions away contradicts what I'd expect
> > to happen. That the pivot requires merges, combined with uncommitted
> > changes and #113809 does then also mess up your working tree.
> >
> > I know the pivot behaviour of update has been discussed in the past, but
> > I can't find a bug for it now.
>
> Here is the contract for update (light and heavy):
> 'update prepares you to commit to the branch after doing some
> uncommitted work'.
> Implications->
> 'update && revert' -> now the same as the branch
> 'update && commit' -> your local work is now on the branch.

That's a nice property, but it also amounts to a _really_ nasty spot in
our UI that makes it hard to do what many people expect.

Wouter van Heyst