Mercurial > evolve
comparison tests/test-evolve-abort-phasediv.t @ 6064:28a77df6e41f mercurial-5.7
test-compat: merge mercurial-5.8 into mercurial-5.7
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 12 Oct 2021 11:15:44 +0300 |
| parents | 1cbafebe874b |
| children | c0921b5277a0 b1d1f4ade142 |
comparison
equal
deleted
inserted
replaced
| 5996:91c3a9dd5f77 | 6064:28a77df6e41f |
|---|---|
| 7 | 7 |
| 8 This test contains cases when `hg evolve` is doing phase-divergence resolution. | 8 This test contains cases when `hg evolve` is doing phase-divergence resolution. |
| 9 | 9 |
| 10 Setup | 10 Setup |
| 11 ===== | 11 ===== |
| 12 | |
| 13 $ . $TESTDIR/testlib/common.sh | |
| 12 | 14 |
| 13 #testcases abortcommand abortflag | 15 #testcases abortcommand abortflag |
| 14 $ cat >> $HGRCPATH <<EOF | 16 $ cat >> $HGRCPATH <<EOF |
| 15 > [phases] | 17 > [phases] |
| 16 > publish = False | 18 > publish = False |
| 17 > [alias] | |
| 18 > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}" | |
| 19 > [extensions] | 19 > [extensions] |
| 20 > evolve = | |
| 20 > EOF | 21 > EOF |
| 21 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH | |
| 22 | 22 |
| 23 #if abortflag | 23 #if abortflag |
| 24 $ cat >> $HGRCPATH <<EOF | 24 $ cat >> $HGRCPATH <<EOF |
| 25 > [alias] | 25 > [alias] |
| 26 > abort = evolve --abort | 26 > abort = evolve --abort |
| 84 $ hg phase -r c41c793e0ef1 --public --hidden | 84 $ hg phase -r c41c793e0ef1 --public --hidden |
| 85 1 new phase-divergent changesets | 85 1 new phase-divergent changesets |
| 86 | 86 |
| 87 $ hg glog | 87 $ hg glog |
| 88 @ 6:ddba58020bc0 added d | 88 @ 6:ddba58020bc0 added d |
| 89 | () draft | 89 | () draft phase-divergent |
| 90 | o 4:c41c793e0ef1 added d | 90 | o 4:c41c793e0ef1 added d |
| 91 | | () public | 91 | | () public |
| 92 | o 3:ca1b80f7960a added c | 92 | o 3:ca1b80f7960a added c |
| 93 | | () public | 93 | | () public |
| 94 | o 2:b1661037fa25 added b | 94 | o 2:b1661037fa25 added b |
| 136 evolve aborted | 136 evolve aborted |
| 137 working directory is now at ddba58020bc0 | 137 working directory is now at ddba58020bc0 |
| 138 | 138 |
| 139 $ hg glog | 139 $ hg glog |
| 140 @ 6:ddba58020bc0 added d | 140 @ 6:ddba58020bc0 added d |
| 141 | () draft | 141 | () draft phase-divergent |
| 142 | o 4:c41c793e0ef1 added d | 142 | o 4:c41c793e0ef1 added d |
| 143 | | () public | 143 | | () public |
| 144 | o 3:ca1b80f7960a added c | 144 | o 3:ca1b80f7960a added c |
| 145 | | () public | 145 | | () public |
| 146 | o 2:b1661037fa25 added b | 146 | o 2:b1661037fa25 added b |
| 190 hg revert --all --rev 28cd06b3f801; | 190 hg revert --all --rev 28cd06b3f801; |
| 191 hg commit --message "phase-divergent update to 28cd06b3f801" | 191 hg commit --message "phase-divergent update to 28cd06b3f801" |
| 192 | 192 |
| 193 $ hg glog --hidden | 193 $ hg glog --hidden |
| 194 @ 9:28cd06b3f801 added c | 194 @ 9:28cd06b3f801 added c |
| 195 | () draft | 195 | () draft phase-divergent |
| 196 | x 8:9ff8adbe8a24 added c | 196 | x 8:9ff8adbe8a24 added c |
| 197 |/ () draft | 197 |/ () draft |
| 198 | * 7:e44ebefe4f54 added d | 198 | * 7:e44ebefe4f54 added d |
| 199 |/ () draft | 199 |/ () draft phase-divergent |
| 200 | x 6:ddba58020bc0 added d | 200 | x 6:ddba58020bc0 added d |
| 201 |/ () draft | 201 |/ () draft |
| 202 | x 5:cfe30edc6125 added d | 202 | x 5:cfe30edc6125 added d |
| 203 |/ () draft | 203 |/ () draft |
| 204 | o 4:c41c793e0ef1 added d | 204 | o 4:c41c793e0ef1 added d |
| 231 evolve aborted | 231 evolve aborted |
| 232 working directory is now at 28cd06b3f801 | 232 working directory is now at 28cd06b3f801 |
| 233 | 233 |
| 234 $ hg glog --hidden | 234 $ hg glog --hidden |
| 235 @ 9:28cd06b3f801 added c | 235 @ 9:28cd06b3f801 added c |
| 236 | () draft | 236 | () draft phase-divergent |
| 237 | x 8:9ff8adbe8a24 added c | 237 | x 8:9ff8adbe8a24 added c |
| 238 |/ () draft | 238 |/ () draft |
| 239 | * 7:e44ebefe4f54 added d | 239 | * 7:e44ebefe4f54 added d |
| 240 |/ () draft | 240 |/ () draft phase-divergent |
| 241 | x 6:ddba58020bc0 added d | 241 | x 6:ddba58020bc0 added d |
| 242 |/ () draft | 242 |/ () draft |
| 243 | x 5:cfe30edc6125 added d | 243 | x 5:cfe30edc6125 added d |
| 244 |/ () draft | 244 |/ () draft |
| 245 | o 4:c41c793e0ef1 added d | 245 | o 4:c41c793e0ef1 added d |
| 262 $ echo foobar > c | 262 $ echo foobar > c |
| 263 $ hg amend | 263 $ hg amend |
| 264 | 264 |
| 265 $ hg glog --hidden | 265 $ hg glog --hidden |
| 266 @ 10:ef9b72b9b42c added d | 266 @ 10:ef9b72b9b42c added d |
| 267 | () draft | 267 | () draft phase-divergent |
| 268 | * 9:28cd06b3f801 added c | 268 | * 9:28cd06b3f801 added c |
| 269 |/ () draft | 269 |/ () draft phase-divergent |
| 270 | x 8:9ff8adbe8a24 added c | 270 | x 8:9ff8adbe8a24 added c |
| 271 |/ () draft | 271 |/ () draft |
| 272 | x 7:e44ebefe4f54 added d | 272 | x 7:e44ebefe4f54 added d |
| 273 |/ () draft | 273 |/ () draft |
| 274 | x 6:ddba58020bc0 added d | 274 | x 6:ddba58020bc0 added d |
| 317 evolve aborted | 317 evolve aborted |
| 318 working directory is now at ef9b72b9b42c | 318 working directory is now at ef9b72b9b42c |
| 319 | 319 |
| 320 $ hg glog --hidden | 320 $ hg glog --hidden |
| 321 @ 10:ef9b72b9b42c added d | 321 @ 10:ef9b72b9b42c added d |
| 322 | () draft | 322 | () draft phase-divergent |
| 323 | * 9:28cd06b3f801 added c | 323 | * 9:28cd06b3f801 added c |
| 324 |/ () draft | 324 |/ () draft phase-divergent |
| 325 | x 8:9ff8adbe8a24 added c | 325 | x 8:9ff8adbe8a24 added c |
| 326 |/ () draft | 326 |/ () draft |
| 327 | x 7:e44ebefe4f54 added d | 327 | x 7:e44ebefe4f54 added d |
| 328 |/ () draft | 328 |/ () draft |
| 329 | x 6:ddba58020bc0 added d | 329 | x 6:ddba58020bc0 added d |