Comment 2 for bug 175589

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.

I emulate the behaviour after the fact with:

  bzr heads --dead
  bzr pull . -r revid:<relevant head>

Unfortunately `bzr st -v --show-ids` doesn't give me the revision ids of merged revisions, that is where heads comes in.