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

[Sean Farley]

liscju <piotr.listkiewicz at gmail.com> writes:

> # 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.
>
> When there are no merge conflicts between shelved commit and
> working context it just set branch on dirstate object to the
> one pointed by shelved commit. If there are merge conflicts
> we need to restore branch name in unshelvecontinue after
> doing rebase. To keep branch information this patch adds to
> rebase invocation in _dounshelve method additional parameter
> keepbranches.

Patch looks fine to me. In general, we really need more tools to rename
/ keep / move branches.