how to revert update operation

[Robert Collins]

On Tue, 2006-07-18 at 15:32 +0300, Alexander Belchenko wrote:
> Robert Collins пишет:
> > On Tue, 2006-07-18 at 15:19 +0300, Alexander Belchenko wrote:
> > 
> >>Adeodato Simó пишет:
> >>
> >>>* Alexander Belchenko [Tue, 18 Jul 2006 14:59:18 +0300]:
> >>>
> >>>>Is there is any chance to ressurect my --local work? I don't remember
> >>>>revid, but may be there is hidden command to browse all revisions that
> >>>>present in repository? Or after update this revisions simply throwed away?
> >>>
> >>>If after the update you didn't do anything else, your --local commits
> >>>will be present as pending merges:
> >>>
> >>>  % bzr status
> >>>  % bzr commit -m 'Merge --local work'
> >>
> >>Oops. My fingers moves faster than I think. I also run revert. :-(
> >>And after revert I lose all.
> > 
> > 
> > We should make update tell you clearly that your work is now ready to
> > commit to the mainline, so that its more clear.
> 
> When I run 'bzr info' it also don't print me anything about divergence 
> between local and master branch.

Ah, because there is none - all the work is now pending merge - pending
a commit.

I dont know, but info should show that too IMO.

Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060718/130d1657/attachment.pgp