[PATCH 2 of 4 V2] shelve: add a shelve extension to save/restore working changes
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Wed Oct 2 16:41:51 UTC 2013
On 10/02/2013 03:17 PM, harry wrote:
> pierre-yves.david wrote
>> Again, there would not have any differences in behavior between:
>> 1. the shelve commit stay in the repo as hidden one
>> 2. the shelve is super-hidden outside of the repo in a bundle.
> Use histedit to make several changes to the shelf's ancestors.
>
> 1. The shelf will be merged after each change. If one of the changes makes
> it impossible to merge the shelf, the user has a chance to abort.
> 2. All the changes will be applied with no warning. When the user tries to
> unshelve, they'll have one big, perhaps impossible merge.
>
> This is the difference in behaviour between the two approaches. Have I
> misunderstood you?
This is wrong. There is no reason shelved should be moved along with
there ancestors.
--
Pierre-Yves David
More information about the Mercurial-devel
mailing list