[PATCH 2 of 5] localrepo: invoke dirstate.unsureifambig in wwrite for safety

Martin von Zweigbergk martinvonz at google.com
Sun Jun 28 23:23:47 CDT 2015


On Sun, Jun 28, 2015 at 9:07 AM FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
wrote:

>
> OK, I'll try to fix problems by invoking `dirstate.write()` at (*1) !


Great! I wasn't sure if I was missing something and wasting everyone's
time. I'm glad it now seems it was worthwhile. And thanks for working on
this! I'm pretty sure I've been bitten at least twice by this while
rebasing (dirty file appeared clean).

Just a reminder that adding a check for dirty dirstate in
localrepo.wwrite() seems like a good way to find the places to fix (and
perhaps for printing a warning after we've fixed the known buggy callers).

Does it make sense for workingctx._dirstatestatus() to do the writing? Or
maybe it needs to be done at a higher level that's aware of any running
transaction?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20150629/60e4ef98/attachment.html>


More information about the Mercurial-devel mailing list