[PATCH] shelve: adds option keepbranch to restore branch after unshelve (issue5048)

Pierre-Yves David pierre-yves.david at ens-lyon.org
Wed Feb 10 16:01:24 EST 2016



On 02/10/2016 01:33 AM, liscju wrote:
> # HG changeset patch
> # User liscju <piotr.listkiewicz at gmail.com>
> # Date 1455067407 -3600
> #      Wed Feb 10 02:23:27 2016 +0100
> # Node ID 35eeb40ad5c59ce6fe9384ca1b6098647692057b
> # Parent  a036e1ae1fbe88ab99cb861ebfc2e4da7a3912ca
> shelve: adds option keepbranch to restore branch after unshelve (issue5048)
>
> Before this patch unshelve has no option to preserve branch name
> of shelved commit. This patch adds --keepbranch option to
> restore branch name.

What do you mean with branchname of the shelved commit. In my 
implementation, shelved-commit are not really a thing. They are just and 
implementatin details.

The question here seems to be "What should shelve do with uncommited 
branch name change"

- I'm pretty sure we don't want unshelve to drop uncommited branch 
change in the general case

- If there is an uncommited branch change at shelve time should we:
   - Include it in the shelve data (and restore it on unshelve)
   - Ignore it a shelve time (but not loosing it).

I all case I think we can define a sensible behavior here and implement 
it. I currently see no need for a new flag.


-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list