Mercurial > evolve
comparison tests/test-obsolete.t @ 492:7ecd41520dae
rename `stabilize` to `evolve`
stabilize keep being valide but as Matt still like "Changeset Evolution" as a
name evolve make more sense.
Stabilize is a bit too tight to unstable too.
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Fri, 24 Aug 2012 11:17:18 +0200 |
| parents | 6989d8fe4ed2 |
| children | 39eb12bb47c0 |
comparison
equal
deleted
inserted
replaced
| 491:6989d8fe4ed2 | 492:7ecd41520dae |
|---|---|
| 164 [255] | 164 [255] |
| 165 $ hg push ../other-new | 165 $ hg push ../other-new |
| 166 pushing to ../other-new | 166 pushing to ../other-new |
| 167 searching for changes | 167 searching for changes |
| 168 abort: push includes an unstable changeset: a7a6f2b5d8a5! | 168 abort: push includes an unstable changeset: a7a6f2b5d8a5! |
| 169 (use 'hg stabilize' to get a stable history or --force to ignore warnings) | 169 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
| 170 [255] | 170 [255] |
| 171 $ hg push -f ../other-new | 171 $ hg push -f ../other-new |
| 172 pushing to ../other-new | 172 pushing to ../other-new |
| 173 searching for changes | 173 searching for changes |
| 174 adding changesets | 174 adding changesets |
| 217 - 0d3f46688ccc | 217 - 0d3f46688ccc |
| 218 $ hg push ../other-new | 218 $ hg push ../other-new |
| 219 pushing to ../other-new | 219 pushing to ../other-new |
| 220 searching for changes | 220 searching for changes |
| 221 abort: push includes an unstable changeset: 95de7fc6918d! | 221 abort: push includes an unstable changeset: 95de7fc6918d! |
| 222 (use 'hg stabilize' to get a stable history or --force to ignore warnings) | 222 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
| 223 [255] | 223 [255] |
| 224 $ hg push ../other-new -f # use f because there is unstability | 224 $ hg push ../other-new -f # use f because there is unstability |
| 225 pushing to ../other-new | 225 pushing to ../other-new |
| 226 searching for changes | 226 searching for changes |
| 227 adding changesets | 227 adding changesets |
| 288 .. $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc | 288 .. $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc |
| 289 .. $ hg push ../other-old | 289 .. $ hg push ../other-old |
| 290 .. pushing to ../other-old | 290 .. pushing to ../other-old |
| 291 .. searching for changes | 291 .. searching for changes |
| 292 .. abort: push includes an unstable changeset: 909a0fb57e5d! | 292 .. abort: push includes an unstable changeset: 909a0fb57e5d! |
| 293 .. (use 'hg stabilize' to get a stable history or --force to ignore warnings) | 293 .. (use 'hg evolve' to get a stable history or --force to ignore warnings) |
| 294 .. [255] | 294 .. [255] |
| 295 .. $ hg push -f ../other-old | 295 .. $ hg push -f ../other-old |
| 296 .. pushing to ../other-old | 296 .. pushing to ../other-old |
| 297 .. searching for changes | 297 .. searching for changes |
| 298 .. adding changesets | 298 .. adding changesets |
| 562 | 562 |
| 563 $ hg push ../other-new/ | 563 $ hg push ../other-new/ |
| 564 pushing to ../other-new/ | 564 pushing to ../other-new/ |
| 565 searching for changes | 565 searching for changes |
| 566 abort: push includes a latecomer changeset: 6db5e282cb91! | 566 abort: push includes a latecomer changeset: 6db5e282cb91! |
| 567 (use 'hg stabilize' to get a stable history or --force to ignore warnings) | 567 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
| 568 [255] | 568 [255] |
| 569 | 569 |
| 570 Check hg commit --amend compat | 570 Check hg commit --amend compat |
| 571 | 571 |
| 572 $ hg up 'desc(obsol_c)' | 572 $ hg up 'desc(obsol_c)' |