Mercurial > evolve
comparison tests/test-evolve.t @ 5477:d60490a28318
evolve: improve warning msg when skipping orphan resolution
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Wed, 22 Jul 2020 23:40:24 +0530 |
| parents | 1b5afe8bb26a |
| children | 98e2613d797d |
comparison
equal
deleted
inserted
replaced
| 5476:d542e9720b1e | 5477:d60490a28318 |
|---|---|
| 1229 | 1229 |
| 1230 $ hg evolve --rev 89e4f7e8feb5 --any | 1230 $ hg evolve --rev 89e4f7e8feb5 --any |
| 1231 abort: cannot specify both "--rev" and "--any" | 1231 abort: cannot specify both "--rev" and "--any" |
| 1232 [255] | 1232 [255] |
| 1233 $ hg evolve --rev 89e4f7e8feb5 | 1233 $ hg evolve --rev 89e4f7e8feb5 |
| 1234 cannot solve instability of 89e4f7e8feb5, skipping | 1234 skipping 89e4f7e8feb5, consider including orphan ancestors |
| 1235 | 1235 |
| 1236 Check that uncommit respects the allowunstable option | 1236 Check that uncommit respects the allowunstable option |
| 1237 With only createmarkers we can only uncommit on a head | 1237 With only createmarkers we can only uncommit on a head |
| 1238 $ cat >> $HGRCPATH <<EOF | 1238 $ cat >> $HGRCPATH <<EOF |
| 1239 > [experimental] | 1239 > [experimental] |