Mercurial > evolve
comparison tests/test-prev-next.t @ 4398:5bca2c579b05
branching: merge with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 08 Feb 2019 17:52:49 +0100 |
| parents | 83d45ded5af8 d2c1e6d61658 |
| children | 256b28ce03e3 |
comparison
equal
deleted
inserted
replaced
| 4396:83d45ded5af8 | 4398:5bca2c579b05 |
|---|---|
| 347 $ hg amend --edit & | 347 $ hg amend --edit & |
| 348 $ sleep 1 | 348 $ sleep 1 |
| 349 $ hg next --evolve | 349 $ hg next --evolve |
| 350 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) | 350 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) |
| 351 1 new orphan changesets | 351 1 new orphan changesets |
| 352 got lock after [4-6] seconds (re) | 352 got lock after (\d+) seconds (re) |
| 353 move:[2] two | 353 move:[2] two |
| 354 atop:[3] one | 354 atop:[3] one |
| 355 working directory now at a7d885c75614 | 355 working directory now at a7d885c75614 |
| 356 $ wait | 356 $ wait |
| 357 | 357 |