[PATCH] shelve: adds restoring newly created branch (issue5048)

[Piotr Listkiewicz]

>
> I had to say that "marked working directory" should be warned only if the
> working branch was actually changed.


Done in patch v2

Let's consider it later. You can concentrate on restoring the shelved
> branch.


I added test to read old format by removing lines from new format. But i
have no idea how to add test that reads new format by old mercurial
version, i tested it only manually and it seems to working

We only shelve (store + remove from wc) if no pattern/selection is issued.
> That does not requires to store "bare shelve" in the file format, just
> control when you shelve the branch change. Something you seems to be
> already able to do.


Done in v2

2016-02-29 18:17 GMT+01:00 Pierre-Yves David <pierre-yves.david at ens-lyon.org
>:

>
>
> On 02/29/2016 09:56 AM, Piotr Listkiewicz wrote:
>
>>         So only in bare shelve restoring branch should take place?
>>
>>     That's a proposal, lets sleep on it and see what other people think
>>     about it.
>>
>>
>> Does 'bare shelve' is shelve without specifying files/filesets?
>>
>> If so, i have a problem with implementation. Probably the place to store
>> if shelve was 'bare' is .hg bundle file for given shelve or new bundle
>> file. In both cases i have no idea how to write this information in it.
>>
>> Other idea would be to store this information in the new text file but
>> this seems like total overkill.
>>
>
> We only shelve (store + remove from wc) if no pattern/selection is issued.
>
> That does not requires to store "bare shelve" in the file format, just
> control when you shelve the branch change. Something you seems to be
> already able to do.
>
> --
> Pierre-Yves David
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20160301/1386f011/attachment.html>