Mercurial > evolve
comparison tests/test-prev-next.t @ 2468:8fadd87da07e mercurial-3.9
test-compat: merge with mercurial-4.0 branch
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 22 May 2017 15:42:13 +0200 |
| parents | fd24f1c7accd e5e502407ab0 |
| children | 49494d0155b7 |
comparison
equal
deleted
inserted
replaced
| 2467:d517659556cf | 2468:8fadd87da07e |
|---|---|
| 229 $ hg ci -Am 'two' | 229 $ hg ci -Am 'two' |
| 230 | 230 |
| 231 $ hg amend --edit & | 231 $ hg amend --edit & |
| 232 $ sleep 1 | 232 $ sleep 1 |
| 233 $ hg prev | 233 $ hg prev |
| 234 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) | 234 waiting for lock on working directory of $TESTTMP/repo held by '*' (glob) |
| 235 got lock after [4-6] seconds (re) | 235 got lock after [4-6] seconds (re) |
| 236 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 236 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 237 [0] one | 237 [0] one |
| 238 $ wait | 238 $ wait |
| 239 | 239 |
| 240 $ hg amend --edit & | 240 $ hg amend --edit & |
| 241 $ sleep 1 | 241 $ sleep 1 |
| 242 $ hg next --evolve | 242 $ hg next --evolve |
| 243 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) | 243 waiting for lock on working directory of $TESTTMP/repo held by '*' (glob) |
| 244 1 new unstable changesets | 244 1 new unstable changesets |
| 245 got lock after [4-6] seconds (re) | 245 got lock after [4-6] seconds (re) |
| 246 move:[2] two | 246 move:[2] two |
| 247 atop:[3] one | 247 atop:[3] one |
| 248 working directory now at a7d885c75614 | 248 working directory now at a7d885c75614 |