Mercurial > evolve
comparison tests/test-evolve-interrupted.t @ 6469:76716ec978da mercurial-5.3
test-compat: merge mercurial-5.4 into mercurial-5.3
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 21 Mar 2023 22:34:59 -0300 |
| parents | 270223576b7f 43a2a333e343 |
| children | 5f77d112be57 ff7a9ad270b2 |
comparison
equal
deleted
inserted
replaced
| 6429:7130a8bdb2c6 | 6469:76716ec978da |
|---|---|
| 43 | 43 |
| 44 | 44 |
| 45 $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other | 45 $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other |
| 46 move:[1] banana | 46 move:[1] banana |
| 47 atop:[2] apricot and blueberry | 47 atop:[2] apricot and blueberry |
| 48 transaction abort! | 48 transaction abort! (no-hg64 !) |
| 49 rollback completed | 49 rollback completed (no-hg64 !) |
| 50 abort: precommit hook exited with status 1 | 50 abort: precommit hook exited with status 1 |
| 51 [255] | 51 [255] |
| 52 $ hg l | 52 $ hg l |
| 53 @ 2 apricot and blueberry | 53 @ 2 apricot and blueberry |
| 54 | 54 |
| 102 | 102 |
| 103 | 103 |
| 104 $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other | 104 $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other |
| 105 move:[1] banana | 105 move:[1] banana |
| 106 atop:[2] apricot and blueberry | 106 atop:[2] apricot and blueberry |
| 107 transaction abort! | 107 transaction abort! (no-hg64 !) |
| 108 rollback completed | 108 rollback completed (no-hg64 !) |
| 109 abort: precommit hook exited with status 1 | 109 abort: precommit hook exited with status 1 |
| 110 [255] | 110 [255] |
| 111 $ cat b | 111 $ cat b |
| 112 banana | 112 banana |
| 113 $ hg evolve --stop | 113 $ hg evolve --stop |
| 127 | 127 |
| 128 | 128 |
| 129 $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other | 129 $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other |
| 130 move:[1] banana | 130 move:[1] banana |
| 131 atop:[2] apricot and blueberry | 131 atop:[2] apricot and blueberry |
| 132 transaction abort! | 132 transaction abort! (no-hg64 !) |
| 133 rollback completed | 133 rollback completed (no-hg64 !) |
| 134 abort: precommit hook exited with status 1 | 134 abort: precommit hook exited with status 1 |
| 135 [255] | 135 [255] |
| 136 $ hg evolve --continue | 136 $ hg evolve --continue |
| 137 evolving 1:e0486f65907d "banana" | 137 evolving 1:e0486f65907d "banana" |
| 138 working directory is now at b10ea0f329d2 | 138 working directory is now at b10ea0f329d2 |