Bazaar

  1. Bug #211434
  2. Comment #5

Comment 5 for bug 211434

Revision history for this message
Robert Collins (lifeless) wrote : Re: [Bug 211434] Re: revert should tell the user what pending merges were thrown away
  • unnamed Edit (189 bytes, application/pgp-signature; name=signature.asc)

On Fri, 2008-04-04 at 05:46 +0000, Aaron Bentley wrote:
>
> When there are local commits, update resets the branch's last_revision
> and makes the tree's last_revision into a pending merge. Doing this
> means that if the user reverts, they throw away their local commits.
>
> If we just fix update so that it doesn't create a situation where
> revert
> will throw away local commits, this complaint would go away.

That would involve crippling update.

-Rob

--
GPG key available at: <http://www.robertcollins.net/keys.txt>.