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

Pierre-Yves David pierre-yves.david at ens-lyon.org
Mon Jun 29 03:55:56 CDT 2015



On 06/28/2015 09:23 PM, Martin von Zweigbergk wrote:
>
>
> On Sun, Jun 28, 2015 at 9:07 AM FUJIWARA Katsunori
> <foozy at lares.dti.ne.jp <mailto: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?


This discussion start to get long and complexe let's says it is time to 
create a Plan page on the wiki. The idea is to have a single place where 
to look for the latest state of the project, the various step we have to 
do and that are the progress made on it.

I've create a stub here:

   https://mercurial.selenic.com/wiki/DirstateTransactionPlan

(Thanks again for documenting and tackling these issue)

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list