# HG changeset patch # User Pierre-Yves David # Date 1549644769 -3600 # Node ID 5bca2c579b05e674775b736e1b3872b5e0d61da0 # Parent 83d45ded5af86f4dbfd30959c4ab2712a2665855# Parent d2c1e6d61658ac809aae6335489f5bd8e4e8c919 branching: merge with stable diff -r 83d45ded5af8 -r 5bca2c579b05 tests/test-prev-next.t --- a/tests/test-prev-next.t Fri Feb 08 09:29:54 2019 +0100 +++ b/tests/test-prev-next.t Fri Feb 08 17:52:49 2019 +0100 @@ -349,7 +349,7 @@ $ hg next --evolve waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) 1 new orphan changesets - got lock after [4-6] seconds (re) + got lock after (\d+) seconds (re) move:[2] two atop:[3] one working directory now at a7d885c75614