D153: test-dirstate-race: replace BROKEN line with explanation of changed output

[sid0 (Siddharth Agarwal)]

sid0 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  See the explanation for more.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D153

AFFECTED FILES
  tests/test-dirstate-race.t

CHANGE DETAILS

diff --git a/tests/test-dirstate-race.t b/tests/test-dirstate-race.t
--- a/tests/test-dirstate-race.t
+++ b/tests/test-dirstate-race.t
@@ -220,7 +220,15 @@
   > test.args=$TESTTMP/mergetool-race.sh \$output
   > EOF
 
-BROKEN: the "M b" line should not be there
+The "M b" line in the hg status output used to not exist, but the changes in
+b63351f6a246 caused the ordering of operations to change such that the dirstate
+gets written out at a different time. This causes the 'hg status' in the middle
+to think that "b" is modified. Note that strictly speaking isn't wrong since c4
+does actually modify "b".
+
+Regardless, we're more interested in testing what happens to 'hg status'
+afterwards, both with and without fsmonitor.
+
   $ hg rebase -s . -d 3 --tool test
   rebasing 4:b08445fd6b2a "c4" (tip)
   merging a



EMAIL PREFERENCES
  https://phab.mercurial-scm.org/settings/panel/emailpreferences/

To: sid0, #hg-reviewers
Cc: mercurial-devel