how to revert update operation

[Erik Bågfors]

On 7/18/06, Robert Collins <robertc at robertcollins.net> wrote:
> On Tue, 2006-07-18 at 14:59 +0300, Alexander Belchenko wrote:
> >
> > My mistake was I ran update. As result all my work is lost. At least
> > all
> > local revisions is lost.
>
> Nothing is lost - your local work is now a pending merge.
>
> just run bzr status.
>
> If you commit, it will all be committed and pushed to your master
> branch.

This actually brings out something I've been meaning to add a bug for.

When I ran "bzr update" the first time on a bound branch, all my
commits was just gone and there was no message where they went.
Luckily, you were on IRC and told me to run "bzr status".

My sugestion is something like

$ bzr update
updates suceeded, your local commits are now put aside and viewable
with "bzr status", commit them with "bzr commit"

Well, bad message, but you get the point...

/Erik

-- 
google talk/jabber. zindar at gmail.com
SIP-phones: sip:erik_bagfors at gizmoproject.com
sip:17476714687 at proxy01.sipphone.com