diff -r ff02bb5979c1 -r add613cddcb6 tests/test-dirstate-race.t --- a/tests/test-dirstate-race.t Tue Jun 13 10:02:34 2017 -0400 +++ b/tests/test-dirstate-race.t Mon Jun 12 13:54:59 2017 -0700 @@ -101,7 +101,7 @@ Test that dirstate changes aren't written out at the end of "hg status", if .hg/dirstate is already changed simultaneously before -acquisition of wlock in workingctx._checklookup(). +acquisition of wlock in workingctx._poststatusfixup(). This avoidance is important to keep consistency of dirstate in race condition (see issue5584 for detail).