Mercurial > evolve
comparison tests/test-evolve-topic.t @ 6065:c0921b5277a0 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 12 Oct 2021 11:32:36 +0300 |
| parents | fd039a7f0c3c 2800aa3c3dbf |
| children | 1328195f76a9 |
comparison
equal
deleted
inserted
replaced
| 6064:28a77df6e41f | 6065:c0921b5277a0 |
|---|---|
| 330 | 330 |
| 331 When the current topic and successors topic are same, but obsolete cset has | 331 When the current topic and successors topic are same, but obsolete cset has |
| 332 different topic | 332 different topic |
| 333 | 333 |
| 334 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= | 334 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= |
| 335 rebasing 16:d2dc89c57700 bar "add iii" | 335 rebasing 16:d2dc89c57700 "add iii" (bar) |
| 336 1 new orphan changesets | 336 1 new orphan changesets |
| 337 rebasing 17:9bf430c106b7 bar "add jjj" | 337 rebasing 17:9bf430c106b7 "add jjj" (bar) |
| 338 1 new orphan changesets | 338 1 new orphan changesets |
| 339 $ hg log -Gr 42b49017ff90:: | 339 $ hg log -Gr 42b49017ff90:: |
| 340 * 21 - {bar} 7542e76aba2c add jjj (draft) | 340 * 21 - {bar} 7542e76aba2c add jjj (draft) |
| 341 | | 341 | |
| 342 * 20 - {bar} 7858bd7e9906 add iii (draft) | 342 * 20 - {bar} 7858bd7e9906 add iii (draft) |
| 420 move:[s3] add hhh | 420 move:[s3] add hhh |
| 421 merging hhh | 421 merging hhh |
| 422 warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark') | 422 warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark') |
| 423 unresolved merge conflicts | 423 unresolved merge conflicts |
| 424 (see 'hg help evolve.interrupted') | 424 (see 'hg help evolve.interrupted') |
| 425 [240] | 425 [1] |
| 426 $ echo "resolved hhh" > hhh | 426 $ echo "resolved hhh" > hhh |
| 427 $ hg resolve --mark hhh | 427 $ hg resolve --mark hhh |
| 428 (no more unresolved files) | 428 (no more unresolved files) |
| 429 continue: hg evolve --continue | 429 continue: hg evolve --continue |
| 430 $ hg evolve --continue | 430 $ hg evolve --continue |