Mercurial > evolve
comparison tests/test-prev-next.t @ 2854:66796d7b5415
warning: rename unstable warning message
unstable has been renamed into orphan. Update the warning message when new
orphan changesets are detected.
Renaming done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 24 Aug 2017 09:11:06 +0200 |
parents | 4dd84054ebbb |
children | bd7e8be29542 |
comparison
equal
deleted
inserted
replaced
2853:cec3d2ea2eeb | 2854:66796d7b5415 |
---|---|
167 [1] added b | 167 [1] added b |
168 | 168 |
169 some aspiring children | 169 some aspiring children |
170 | 170 |
171 $ hg amend -m 'added b (2)' | 171 $ hg amend -m 'added b (2)' |
172 1 new unstable changesets | 172 1 new orphan changesets |
173 $ hg next | 173 $ hg next |
174 no children | 174 no children |
175 (1 unstable changesets to be evolved here, do you want --evolve?) | 175 (1 unstable changesets to be evolved here, do you want --evolve?) |
176 [1] | 176 [1] |
177 $ hg next --evolve --dry-run | 177 $ hg next --evolve --dry-run |
207 [1] | 207 [1] |
208 | 208 |
209 next with ambiguity in aspiring children | 209 next with ambiguity in aspiring children |
210 | 210 |
211 $ hg am -m 'added b (3)' | 211 $ hg am -m 'added b (3)' |
212 2 new unstable changesets | 212 2 new orphan changesets |
213 $ hg next | 213 $ hg next |
214 no children | 214 no children |
215 (2 unstable changesets to be evolved here, do you want --evolve?) | 215 (2 unstable changesets to be evolved here, do you want --evolve?) |
216 [1] | 216 [1] |
217 $ hg next --evolve | 217 $ hg next --evolve |
249 | 249 |
250 $ hg amend --edit & | 250 $ hg amend --edit & |
251 $ sleep 1 | 251 $ sleep 1 |
252 $ hg next --evolve | 252 $ hg next --evolve |
253 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) | 253 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) |
254 1 new unstable changesets | 254 1 new orphan changesets |
255 got lock after [4-6] seconds (re) | 255 got lock after [4-6] seconds (re) |
256 move:[2] two | 256 move:[2] two |
257 atop:[3] one | 257 atop:[3] one |
258 working directory now at a7d885c75614 | 258 working directory now at a7d885c75614 |
259 $ wait | 259 $ wait |