Mercurial > hg
comparison tests/test-transplant.t @ 42532:12243f15d53e
statecheck: added support for STATES
This removes `STATES` from `state.py` and adds support to
`statecheck` class to handle its features.
`getrepostate()` function is modified accordingly.
This adds a method 'cmdutil.addunfinished()' for appending to
the unfinishedstate list so as to keep 'merge' and 'bisect' at the last.
This also makes two separate message formats for `checkunfinished()` and
`getrepostate()` as there were previously present.
Results of test changed are shown.
Differential Revision: https://phab.mercurial-scm.org/D6503
author | Taapas Agrawal <taapas2897@gmail.com> |
---|---|
date | Sun, 09 Jun 2019 02:12:58 +0530 |
parents | 251332dbf33d |
children | 0a4303c77637 |
comparison
equal
deleted
inserted
replaced
42531:5bddd2244814 | 42532:12243f15d53e |
---|---|
38 $ hg merge 1 | 38 $ hg merge 1 |
39 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 39 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
40 (branch merge, don't forget to commit) | 40 (branch merge, don't forget to commit) |
41 $ hg transplant 1 | 41 $ hg transplant 1 |
42 abort: outstanding uncommitted merge | 42 abort: outstanding uncommitted merge |
43 (use 'hg commit' or 'hg merge --abort') | |
43 [255] | 44 [255] |
44 $ hg up -qC tip | 45 $ hg up -qC tip |
45 $ echo b0 > b1 | 46 $ echo b0 > b1 |
46 $ hg transplant 1 | 47 $ hg transplant 1 |
47 abort: uncommitted changes | 48 abort: uncommitted changes |
459 added | 460 added |
460 bar | 461 bar |
461 baz | 462 baz |
462 foo | 463 foo |
463 | 464 |
464 test multiple revisions and --continue | 465 test multiple revisions, --continue and hg status --verbose |
465 | 466 |
466 $ hg up -qC 0 | 467 $ hg up -qC 0 |
467 $ echo bazbaz > baz | 468 $ echo bazbaz > baz |
468 $ hg ci -Am anotherbaz baz | 469 $ hg ci -Am anotherbaz baz |
469 created new head | 470 created new head |
479 [255] | 480 [255] |
480 $ hg transplant 1:3 | 481 $ hg transplant 1:3 |
481 abort: transplant in progress | 482 abort: transplant in progress |
482 (use 'hg transplant --continue' or 'hg update' to abort) | 483 (use 'hg transplant --continue' or 'hg update' to abort) |
483 [255] | 484 [255] |
485 $ hg status -v | |
486 A bar | |
487 ? baz.rej | |
488 ? foo.rej | |
489 # The repository is in an unfinished *transplant* state. | |
490 | |
491 # To continue: hg transplant --continue | |
492 # To abort: hg update | |
493 | |
484 $ echo fixed > baz | 494 $ echo fixed > baz |
485 $ hg transplant --continue | 495 $ hg transplant --continue |
486 9d6d6b5a8275 transplanted as d80c49962290 | 496 9d6d6b5a8275 transplanted as d80c49962290 |
487 applying 1dab759070cf | 497 applying 1dab759070cf |
488 1dab759070cf transplanted to aa0ffe6bd5ae | 498 1dab759070cf transplanted to aa0ffe6bd5ae |