Mercurial > evolve

comparison tests/test-prev-next.t @ 3112:706402d70b3f mercurial-3.9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge with mercurial-4.0 branch
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 18:44:52 +0200
parents a456f55b3a6b 3024ae293732
children
comparison
equal deleted inserted replaced
3111:7518ff7f26da 3112:706402d70b3f
240 $ hg ci -Am 'two' 240 $ hg ci -Am 'two'
241 241
242 $ hg amend --edit & 242 $ hg amend --edit &
243 $ sleep 1 243 $ sleep 1
244 $ hg prev 244 $ hg prev
245 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) 245 waiting for lock on working directory of $TESTTMP/repo held by '*' (glob)
246 got lock after [4-6] seconds (re) 246 got lock after [4-6] seconds (re)
247 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 247 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
248 [0] one 248 [0] one
249 $ wait 249 $ wait
250 250
251 $ hg amend --edit & 251 $ hg amend --edit &
252 $ sleep 1 252 $ sleep 1
253 $ hg next --evolve 253 $ hg next --evolve
254 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) 254 waiting for lock on working directory of $TESTTMP/repo held by '*' (glob)
255 1 new unstable changesets 255 1 new unstable changesets
256 got lock after [4-6] seconds (re) 256 got lock after [4-6] seconds (re)
257 move:[2] two 257 move:[2] two
258 atop:[3] one 258 atop:[3] one
259 working directory now at a7d885c75614 259 working directory now at a7d885c75614