Mercurial > evolve
comparison tests/test-evolve-interrupted.t @ 4865:31c481934138 mercurial-4.8
test-compat: merge mercurial-4.9 into mercurial-4.8
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 27 Sep 2019 13:03:16 +0200 |
| parents | 535ab2609e45 |
| children | 58b225aa4298 |
comparison
equal
deleted
inserted
replaced
| 4864:9710597f0155 | 4865:31c481934138 |
|---|---|
| 40 * 1 banana | 40 * 1 banana |
| 41 | | 41 | |
| 42 x 0 apricot | 42 x 0 apricot |
| 43 | 43 |
| 44 | 44 |
| 45 $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other | 45 $ HGMERGE=internal:other hg evolve --update --config hooks.precommit=false --config ui.merge=internal: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! |
| 49 rollback completed | 49 rollback completed |
| 50 abort: precommit hook exited with status 1 | 50 abort: precommit hook exited with status 1 |
| 100 * 1 banana | 100 * 1 banana |
| 101 | | 101 | |
| 102 x 0 apricot | 102 x 0 apricot |
| 103 | 103 |
| 104 | 104 |
| 105 $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other | 105 $ HGMERGE=internal:other hg evolve --update --config hooks.precommit=false --config ui.merge=:other |
| 106 move:[1] banana | 106 move:[1] banana |
| 107 atop:[2] apricot and blueberry | 107 atop:[2] apricot and blueberry |
| 108 transaction abort! | 108 transaction abort! |
| 109 rollback completed | 109 rollback completed |
| 110 abort: precommit hook exited with status 1 | 110 abort: precommit hook exited with status 1 |
| 125 * 1 banana | 125 * 1 banana |
| 126 | | 126 | |
| 127 x 0 apricot | 127 x 0 apricot |
| 128 | 128 |
| 129 | 129 |
| 130 $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other | 130 $ HGMERGE=internal:other hg evolve --update --config hooks.precommit=false --config ui.merge=:other |
| 131 move:[1] banana | 131 move:[1] banana |
| 132 atop:[2] apricot and blueberry | 132 atop:[2] apricot and blueberry |
| 133 transaction abort! | 133 transaction abort! |
| 134 rollback completed | 134 rollback completed |
| 135 abort: precommit hook exited with status 1 | 135 abort: precommit hook exited with status 1 |