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

Sean Farley sean at farley.io
Thu Apr 7 18:37:25 EDT 2016


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?!


More information about the Mercurial-devel mailing list