comparison tests/test-prev-next.t @ 6401:716912541759 mercurial-5.0

test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 07 Feb 2023 10:51:10 +0400
parents 4cf673319dfc 1328195f76a9
children
comparison
equal deleted inserted replaced
6355:4cf673319dfc 6401:716912541759
364 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) 364 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
365 1 new orphan changesets 365 1 new orphan changesets
366 got lock after (\d+) seconds (re) 366 got lock after (\d+) seconds (re)
367 move:[2] two 367 move:[2] two
368 atop:[3] one 368 atop:[3] one
369 working directory is now at a7d885c75614 369 working directory is now at ab3a85718ec9
370 $ wait 370 $ wait
371 371
372 testing next --evolve when working directory is dirty 372 testing next --evolve when working directory is dirty
373 373
374 $ hg log -GT "{rev}:{node|short} {desc|firstline}" 374 $ hg log -GT "{rev}:{node|short} {desc|firstline}"
375 @ 4:a7d885c75614 two 375 @ 4:ab3a85718ec9 two
376 | 376 |
377 o 3:c741983992fc one 377 o 3:c741983992fc one
378 378
379 379
380 $ hg up .^ 380 $ hg up .^