D4758: tests: de-flake test-narrow-debugrebuilddirstate.t

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Wed Sep 26 19:06:57 UTC 2018


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

REVISION SUMMARY
  If the dirstate gets written much (usually 1-2 s, depending on FS)
  than the working copy file (there's only one), then the `hg
  debugdirstate` command will include a timestamp. There's nothing wrong
  with that, so we should just allow it.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  tests/test-narrow-debugrebuilddirstate.t

CHANGE DETAILS

diff --git a/tests/test-narrow-debugrebuilddirstate.t b/tests/test-narrow-debugrebuilddirstate.t
--- a/tests/test-narrow-debugrebuilddirstate.t
+++ b/tests/test-narrow-debugrebuilddirstate.t
@@ -21,8 +21,8 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd copy
 
-  $ hg debugdirstate
-  n *         20 unset               foo/bar (glob)
+  $ hg debugdirstate --no-dates
+  n *         20 *               foo/bar (glob)
   $ mv .hg/dirstate .hg/old_dirstate
   $ dd bs=40 count=1 if=.hg/old_dirstate of=.hg/dirstate 2>/dev/null
   $ hg debugdirstate



To: martinvonz, durin42, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list