Mercurial > evolve
comparison tests/test-obsolete.t @ 390:54582eebeb08
obsolete: fix typos, improve messages
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Thu, 26 Jul 2012 13:40:32 +0200 |
| parents | cb575242d2ba |
| children | 42828b0ace98 |
comparison
equal
deleted
inserted
replaced
| 389:cb575242d2ba | 390:54582eebeb08 |
|---|---|
| 158 [255] | 158 [255] |
| 159 $ hg push ../other-new | 159 $ hg push ../other-new |
| 160 pushing to ../other-new | 160 pushing to ../other-new |
| 161 searching for changes | 161 searching for changes |
| 162 abort: push includes an unstable changeset: a7a6f2b5d8a5! | 162 abort: push includes an unstable changeset: a7a6f2b5d8a5! |
| 163 (use 'hg stabilize' to get a stable history (or --force to proceed)) | 163 (use 'hg stabilize' to get a stable history or --force to ignore warnings) |
| 164 [255] | 164 [255] |
| 165 $ hg push -f ../other-new | 165 $ hg push -f ../other-new |
| 166 pushing to ../other-new | 166 pushing to ../other-new |
| 167 searching for changes | 167 searching for changes |
| 168 adding changesets | 168 adding changesets |
| 211 - 0d3f46688ccc | 211 - 0d3f46688ccc |
| 212 $ hg push ../other-new | 212 $ hg push ../other-new |
| 213 pushing to ../other-new | 213 pushing to ../other-new |
| 214 searching for changes | 214 searching for changes |
| 215 abort: push includes an unstable changeset: 95de7fc6918d! | 215 abort: push includes an unstable changeset: 95de7fc6918d! |
| 216 (use 'hg stabilize' to get a stable history (or --force to proceed)) | 216 (use 'hg stabilize' to get a stable history or --force to ignore warnings) |
| 217 [255] | 217 [255] |
| 218 $ hg push ../other-new -f # use f because there is unstability | 218 $ hg push ../other-new -f # use f because there is unstability |
| 219 pushing to ../other-new | 219 pushing to ../other-new |
| 220 searching for changes | 220 searching for changes |
| 221 adding changesets | 221 adding changesets |
| 280 $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc | 280 $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc |
| 281 $ hg push ../other-old | 281 $ hg push ../other-old |
| 282 pushing to ../other-old | 282 pushing to ../other-old |
| 283 searching for changes | 283 searching for changes |
| 284 abort: push includes an unstable changeset: 909a0fb57e5d! | 284 abort: push includes an unstable changeset: 909a0fb57e5d! |
| 285 (use 'hg stabilize' to get a stable history (or --force to proceed)) | 285 (use 'hg stabilize' to get a stable history or --force to ignore warnings) |
| 286 [255] | 286 [255] |
| 287 $ hg push -f ../other-old | 287 $ hg push -f ../other-old |
| 288 pushing to ../other-old | 288 pushing to ../other-old |
| 289 searching for changes | 289 searching for changes |
| 290 adding changesets | 290 adding changesets |
| 530 summary: add obsol_d''' | 530 summary: add obsol_d''' |
| 531 | 531 |
| 532 $ hg push ../other-new/ | 532 $ hg push ../other-new/ |
| 533 pushing to ../other-new/ | 533 pushing to ../other-new/ |
| 534 searching for changes | 534 searching for changes |
| 535 abort: push includes an latecomer changeset: 6db5e282cb91! | 535 abort: push includes a latecomer changeset: 6db5e282cb91! |
| 536 (use 'hg stabilize' to get a stable history (or --force to proceed)) | 536 (use 'hg stabilize' to get a stable history or --force to ignore warnings) |
| 537 [255] | 537 [255] |
| 538 | 538 |
| 539 Check hg commit --amend compat | 539 Check hg commit --amend compat |
| 540 | 540 |
| 541 $ hg up 'desc(obsol_c)' | 541 $ hg up 'desc(obsol_c)' |