sid0 updated this revision to Diff 351.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D153?vs=337=351
REVISION DETAIL
https://phab.mercurial-scm.org/D153
AFFECTED FILES
tests/test-dirstate-race.t
CHANGE DETAILS
diff --git
martinvonz added inline comments.
INLINE COMMENTS
> sid0 wrote in test-dirstate-race.t:223-231
> I'm afraid not -- debugrebuilddirstate will try to acquire the wlock, which
> is already held by the rebase.
Makes sense (for others' info: "hg status" will write the dirstate if the lock
can be
sid0 added inline comments.
INLINE COMMENTS
> martinvonz wrote in test-dirstate-race.t:223-231
> Oh, the "hg status" is just to cause it to write the dirstate? Would "hg
> debugrebuilddirstate" work? That doesn't produce any output and it's clearer
> that that will result in the dirstate
martinvonz added inline comments.
INLINE COMMENTS
> sid0 wrote in test-dirstate-race.t:223-231
> The *last* hg status should be empty. This is an intermediate hg status.
Oh, the "hg status" is just to cause it to write the dirstate? Would "hg
debugrebuilddirstate" work? That doesn't produce
sid0 added inline comments.
INLINE COMMENTS
> test-dirstate-race.t:244
>
>$ hg status
^^ this one should be empty.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D153
EMAIL PREFERENCES
https://phab.mercurial-scm.org/settings/panel/emailpreferences/
To:
sid0 added inline comments.
INLINE COMMENTS
> martinvonz wrote in test-dirstate-race.t:223-231
> The commit that introduced this test case
> (https://phab.mercurial-scm.org/rHG15e85dded93323d286dc0a758edde1b9dbea5cdd)
> referred to bug https://bz.mercurial-scm.org/show_bug.cgi?id=5581. The
>
martinvonz added inline comments.
INLINE COMMENTS
> test-dirstate-race.t:223-231
> +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
sid0 added a comment.
(I think this should go into stable as a "test fix")
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D153
EMAIL PREFERENCES
https://phab.mercurial-scm.org/settings/panel/emailpreferences/
To: sid0, #hg-reviewers
Cc: mercurial-devel
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
