# HG changeset patch # User Pierre-Yves David # Date 1549614594 -3600 # Node ID 83d45ded5af86f4dbfd30959c4ab2712a2665855 # Parent c6d1b0a6babe0990e486ee46b612e7a73769468e# Parent 610999a1bae1fcb17f9fc535f3cddacc1120c32e branching: merge with stable diff -r c6d1b0a6babe -r 83d45ded5af8 tests/test-prev-next.t --- a/tests/test-prev-next.t Wed Nov 21 12:00:46 2018 +0000 +++ b/tests/test-prev-next.t Fri Feb 08 09:29:54 2019 +0100 @@ -339,7 +339,7 @@ $ sleep 1 $ hg prev waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) - got lock after [4-6] seconds (re) + got lock after (\d+) seconds (re) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [0] one $ wait