Mercurial > evolve
comparison tests/test-stabilize-result.t @ 1390:03f202bed47f stable
evolve: fix default value for --confirm
Before this changes, the default was yes, unlike advertised.
The test were actually catching that so I go them updated.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 18 Jun 2015 18:05:57 -0700 |
| parents | 9e062e6598e9 |
| children | 35518d26b549 362e2c8c5677 |
comparison
equal
deleted
inserted
replaced
| 1389:87aceaed5c69 | 1390:03f202bed47f |
|---|---|
| 28 (leaving bookmark changea) | 28 (leaving bookmark changea) |
| 29 $ echo a >> a | 29 $ echo a >> a |
| 30 $ hg amend -m changea | 30 $ hg amend -m changea |
| 31 1 new unstable changesets | 31 1 new unstable changesets |
| 32 $ hg evolve -v --confirm | 32 $ hg evolve -v --confirm |
| 33 move:[2] changea | |
| 34 atop:[4] changea | |
| 35 perform evolve? [Ny] n | |
| 36 abort: evolve aborted by user | |
| 37 [255] | |
| 38 $ echo y | hg evolve -v --confirm --config ui.interactive=True | |
| 33 move:[2] changea | 39 move:[2] changea |
| 34 atop:[4] changea | 40 atop:[4] changea |
| 35 perform evolve? [Ny] y | 41 perform evolve? [Ny] y |
| 36 hg rebase -r cce2c55b8965 -d fb9d051ec0a4 | 42 hg rebase -r cce2c55b8965 -d fb9d051ec0a4 |
| 37 resolving manifests | 43 resolving manifests |
| 160 hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re) | 166 hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re) |
| 161 hg commit --msg "bumped update to %s" (no-eol) | 167 hg commit --msg "bumped update to %s" (no-eol) |
| 162 $ hg evolve --any --confirm | 168 $ hg evolve --any --confirm |
| 163 recreate:[12] newer a | 169 recreate:[12] newer a |
| 164 atop:[8] newer a | 170 atop:[8] newer a |
| 171 perform evolve? [Ny] n | |
| 172 abort: evolve aborted by user | |
| 173 [255] | |
| 174 $ echo y | hg evolve --any --confirm --config ui.interactive=True | |
| 175 recreate:[12] newer a | |
| 176 atop:[8] newer a | |
| 165 perform evolve? [Ny] y | 177 perform evolve? [Ny] y |
| 166 rebasing to destination parent: 66719795a494 | 178 rebasing to destination parent: 66719795a494 |
| 167 computing new diff | 179 computing new diff |
| 168 committed as (a7cabd7bd9c2|671b9d7eeaec) (re) | 180 committed as (a7cabd7bd9c2|671b9d7eeaec) (re) |
| 169 working directory is now at (a7cabd7bd9c2|671b9d7eeaec) (re) | 181 working directory is now at (a7cabd7bd9c2|671b9d7eeaec) (re) |
| 234 o 0:07f494440405@default(public) bk:[] adda | 246 o 0:07f494440405@default(public) bk:[] adda |
| 235 | 247 |
| 236 | 248 |
| 237 Stabilize it | 249 Stabilize it |
| 238 | 250 |
| 239 $ hg evolve -qn --traceback --confirm | 251 $ hg evolve -qn --confirm |
| 252 merge:[19] More addition | |
| 253 with: [17] More addition | |
| 254 base: [15] More addition | |
| 255 perform evolve? [Ny] n | |
| 256 abort: evolve aborted by user | |
| 257 [255] | |
| 258 $ echo y | hg evolve -qn --confirm --config ui.interactive=True | |
| 240 merge:[19] More addition | 259 merge:[19] More addition |
| 241 with: [17] More addition | 260 with: [17] More addition |
| 242 base: [15] More addition | 261 base: [15] More addition |
| 243 perform evolve? [Ny] y | 262 perform evolve? [Ny] y |
| 244 hg update -c eacc9c8240fe && | 263 hg update -c eacc9c8240fe && |