Mercurial > evolve
comparison tests/test-prev-next.t @ 3013:945a0989e41b
packaging: merge stable back into default
6.7.0 has been released.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 27 Sep 2017 16:26:30 +0200 |
| parents | bd7e8be29542 |
| children | a867d59ea97a 94e5235e95f5 8cc8fb94cc00 |
comparison
equal
deleted
inserted
replaced
| 3012:081070828703 | 3013:945a0989e41b |
|---|---|
| 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 |