Mercurial > evolve
comparison tests/test-prev-next.t @ 6392:faea18a26188 mercurial-5.9
test-compat: merge mercurial-6.0 into mercurial-5.9
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 06 Feb 2023 18:56:14 +0400 |
| parents | 2cfae49c6c34 e959390490c2 |
| children | 1cf185dd551a |
comparison
equal
deleted
inserted
replaced
| 6346:a159b6195fe3 | 6392:faea18a26188 |
|---|---|
| 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 .^ |