Mercurial > evolve
comparison tests/test-evolve-stop-orphan.t @ 6396:e5bd76f95145 mercurial-5.5
test-compat: merge mercurial-5.6 into mercurial-5.5
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 06 Feb 2023 21:38:31 +0400 |
| parents | 34f5c849fc1d 1328195f76a9 |
| children | 567cc86f2d01 43a2a333e343 |
comparison
equal
deleted
inserted
replaced
| 6350:0aff320554d2 | 6396:e5bd76f95145 |
|---|---|
| 204 $ hg resolve -m | 204 $ hg resolve -m |
| 205 (no more unresolved files) | 205 (no more unresolved files) |
| 206 continue: hg evolve --continue | 206 continue: hg evolve --continue |
| 207 $ hg evolve --continue | 207 $ hg evolve --continue |
| 208 evolving 4:c41c793e0ef1 "added d" | 208 evolving 4:c41c793e0ef1 "added d" |
| 209 working directory is now at 2a4e03d422e2 | 209 working directory is now at 250d8c3c5ad9 |
| 210 $ hg glog | 210 $ hg glog |
| 211 @ 6:2a4e03d422e2 added d | 211 @ 6:250d8c3c5ad9 added d |
| 212 | () draft | 212 | () draft |
| 213 o 5:cb6a2ab625bb added c | 213 o 5:cb6a2ab625bb added c |
| 214 | () draft | 214 | () draft |
| 215 o 2:b1661037fa25 added b | 215 o 2:b1661037fa25 added b |
| 216 | () draft | 216 | () draft |
| 227 4 new orphan changesets | 227 4 new orphan changesets |
| 228 | 228 |
| 229 $ hg glog | 229 $ hg glog |
| 230 @ 7:21817cd42526 added hgignore | 230 @ 7:21817cd42526 added hgignore |
| 231 () draft | 231 () draft |
| 232 * 6:2a4e03d422e2 added d | 232 * 6:250d8c3c5ad9 added d |
| 233 | () draft orphan | 233 | () draft orphan |
| 234 * 5:cb6a2ab625bb added c | 234 * 5:cb6a2ab625bb added c |
| 235 | () draft orphan | 235 | () draft orphan |
| 236 * 2:b1661037fa25 added b | 236 * 2:b1661037fa25 added b |
| 237 | () draft orphan | 237 | () draft orphan |
| 265 | () draft | 265 | () draft |
| 266 o 8:fd00db71edca added a | 266 o 8:fd00db71edca added a |
| 267 | () draft | 267 | () draft |
| 268 @ 7:21817cd42526 added hgignore | 268 @ 7:21817cd42526 added hgignore |
| 269 () draft | 269 () draft |
| 270 * 6:2a4e03d422e2 added d | 270 * 6:250d8c3c5ad9 added d |
| 271 | () draft orphan | 271 | () draft orphan |
| 272 * 5:cb6a2ab625bb added c | 272 * 5:cb6a2ab625bb added c |
| 273 | () draft orphan | 273 | () draft orphan |
| 274 x 2:b1661037fa25 added b | 274 x 2:b1661037fa25 added b |
| 275 | () draft | 275 | () draft |
| 296 $ hg evolve --continue | 296 $ hg evolve --continue |
| 297 evolving 5:cb6a2ab625bb "added c" | 297 evolving 5:cb6a2ab625bb "added c" |
| 298 move:[6] added d | 298 move:[6] added d |
| 299 atop:[10] added c | 299 atop:[10] added c |
| 300 $ hg glog | 300 $ hg glog |
| 301 o 11:cd0909a30222 added d | 301 o 11:4b77e6973234 added d |
| 302 | () draft | 302 | () draft |
| 303 o 10:cb1dd1086ef6 added c | 303 o 10:b4e2f43191a0 added c |
| 304 | () draft | 304 | () draft |
| 305 o 9:aec285328e90 added b | 305 o 9:aec285328e90 added b |
| 306 | () draft | 306 | () draft |
| 307 o 8:fd00db71edca added a | 307 o 8:fd00db71edca added a |
| 308 | () draft | 308 | () draft |
| 320 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 320 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 321 (leaving bookmark b1) | 321 (leaving bookmark b1) |
| 322 $ hg bookmark b2 | 322 $ hg bookmark b2 |
| 323 | 323 |
| 324 $ hg glog | 324 $ hg glog |
| 325 o 11:cd0909a30222 added d | 325 o 11:4b77e6973234 added d |
| 326 | () draft | 326 | () draft |
| 327 o 10:cb1dd1086ef6 added c | 327 o 10:b4e2f43191a0 added c |
| 328 | (b1) draft | 328 | (b1) draft |
| 329 @ 9:aec285328e90 added b | 329 @ 9:aec285328e90 added b |
| 330 | (b2) draft | 330 | (b2) draft |
| 331 o 8:fd00db71edca added a | 331 o 8:fd00db71edca added a |
| 332 | () draft | 332 | () draft |
| 341 3 new orphan changesets | 341 3 new orphan changesets |
| 342 | 342 |
| 343 $ hg glog | 343 $ hg glog |
| 344 @ 12:a3cc2042492f added a | 344 @ 12:a3cc2042492f added a |
| 345 | () draft | 345 | () draft |
| 346 | * 11:cd0909a30222 added d | 346 | * 11:4b77e6973234 added d |
| 347 | | () draft orphan | 347 | | () draft orphan |
| 348 | * 10:cb1dd1086ef6 added c | 348 | * 10:b4e2f43191a0 added c |
| 349 | | (b1) draft orphan | 349 | | (b1) draft orphan |
| 350 | * 9:aec285328e90 added b | 350 | * 9:aec285328e90 added b |
| 351 | | (b2) draft orphan | 351 | | (b2) draft orphan |
| 352 | x 8:fd00db71edca added a | 352 | x 8:fd00db71edca added a |
| 353 |/ () draft | 353 |/ () draft |
| 372 $ hg glog | 372 $ hg glog |
| 373 o 13:a3f4b95da934 added b | 373 o 13:a3f4b95da934 added b |
| 374 | (b2) draft | 374 | (b2) draft |
| 375 @ 12:a3cc2042492f added a | 375 @ 12:a3cc2042492f added a |
| 376 | () draft | 376 | () draft |
| 377 | * 11:cd0909a30222 added d | 377 | * 11:4b77e6973234 added d |
| 378 | | () draft orphan | 378 | | () draft orphan |
| 379 | * 10:cb1dd1086ef6 added c | 379 | * 10:b4e2f43191a0 added c |
| 380 | | (b1) draft orphan | 380 | | (b1) draft orphan |
| 381 | x 9:aec285328e90 added b | 381 | x 9:aec285328e90 added b |
| 382 | | () draft | 382 | | () draft |
| 383 | x 8:fd00db71edca added a | 383 | x 8:fd00db71edca added a |
| 384 |/ () draft | 384 |/ () draft |