[PATCH 8 of 9] shelve: status messages from unshelve

Mads Kiilerich mads at kiilerich.com
Sun Feb 9 18:09:41 CST 2014


On 02/10/2014 01:01 AM, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1391990067 -3600
> #      Mon Feb 10 00:54:27 2014 +0100
> # Node ID 18170d3588ff3bcce64a866e1db848b8bfb371b2
> # Parent  04610a5b38ce9ca5d2274710cd47749f291ddfa0
> shelve: status messages from unshelve
>
> It was hard for the user to know what was going on when unshelving - especially
> if the user had to resolve conflicts and thus got to see the intermediate
> states.
>
> Seeing that pending changes was gone could scare the user, make him panic, and
> do stuff that really made him lose data.
>
> Merging (both when rebasing and with pending changes) also requires some
> understanding of where in the process you are and what you are merging.
>
> To help the user we now show a couple of status messages (when relevant):
>    temporarily committing pending changes (restore with 'hg unshelve --abort')

I hope we can come up with a better message than this. It is like it 
says too much but doesn't say enough.

One thing it doesn't say is that --abort only should be used when 
panicking and normally after a successful unshelve is completely irrelevant.

/Mads


More information about the Mercurial-devel mailing list