[PATCH V2] shelve: restore parents after unshelve (issue5123)

[Piotr Listkiewicz]

>
> Good point. Perhaps we'll need repo.status() ?
> https://selenic.com/repo/hg/file/3.7.3/mercurial/cmdutil.py#l2561


Totally right, with repo.status i was able to include merge files but there
is another problem :P Now merged files are added in repo and in working
context but are marked as added instead of modified, i sent patch V3 to
show this behaviour. It probably has sth to do with bad dirstate content
after setting parent as Pierre-Yves mentioned before:


> I know that there is usually dirstate content issue after the use of set
> parent. Did you pay attention to them? I'm not sure how to generate a bad
> case here, but If you have not though about it yet, please wider your
> testing.


2016-04-08 0:37 GMT+02:00 Sean Farley <sean at farley.io>:

>
> Yuya Nishihara <yuya at tcha.org> writes:
>
> > On Tue, 5 Apr 2016 10:49:57 +0200, Piotr Listkiewicz wrote:
> >> When i started to test content of directory before/after unshelve even
> >> slightly different problem occured at first. When merge is done the
> >> new files from merge changeset are appearing as modified in status.
> >> Because status is not clean it commits pending changes to tmpwctx.
> >> After a commit status is clean but tmpwctx.files() is empty -  it
> >> doesn't contain "merged files". It can be reproduced by:
> >
> > Good point. Perhaps we'll need repo.status() ?
> >
> > https://selenic.com/repo/hg/file/3.7.3/mercurial/cmdutil.py#l2561
>
> I thought I removed repo.status?!
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20160411/b0ba12c3/attachment.html>