Mercurial > evolve
comparison tests/test-obsolete.t @ 2834:38db1466c6fb
log: unstable was renamed into orphan
Unstable was renamed into orphan, update tests.
Match 03039ff3082b mercurial changeset.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 10 Aug 2017 17:37:31 +0200 |
| parents | 08a64770ed24 |
| children | 20c2499ce8bc |
comparison
equal
deleted
inserted
replaced
| 2833:08a64770ed24 | 2834:38db1466c6fb |
|---|---|
| 173 abort: empty revision set | 173 abort: empty revision set |
| 174 [255] | 174 [255] |
| 175 $ hg push ../other-new | 175 $ hg push ../other-new |
| 176 pushing to ../other-new | 176 pushing to ../other-new |
| 177 searching for changes | 177 searching for changes |
| 178 abort: push includes unstable changeset: a7a6f2b5d8a5! | 178 abort: push includes orphan changeset: a7a6f2b5d8a5! |
| 179 (use 'hg evolve' to get a stable history or --force to ignore warnings) | 179 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
| 180 [255] | 180 [255] |
| 181 $ hg push -f ../other-new | 181 $ hg push -f ../other-new |
| 182 pushing to ../other-new | 182 pushing to ../other-new |
| 183 searching for changes | 183 searching for changes |
| 228 3 | 228 3 |
| 229 - 0d3f46688ccc | 229 - 0d3f46688ccc |
| 230 $ hg push ../other-new | 230 $ hg push ../other-new |
| 231 pushing to ../other-new | 231 pushing to ../other-new |
| 232 searching for changes | 232 searching for changes |
| 233 abort: push includes unstable changeset: 95de7fc6918d! | 233 abort: push includes orphan changeset: 95de7fc6918d! |
| 234 (use 'hg evolve' to get a stable history or --force to ignore warnings) | 234 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
| 235 [255] | 235 [255] |
| 236 $ hg push ../other-new -f # use f because there is unstability | 236 $ hg push ../other-new -f # use f because there is unstability |
| 237 pushing to ../other-new | 237 pushing to ../other-new |
| 238 searching for changes | 238 searching for changes |
| 395 add obsol_c' | 395 add obsol_c' |
| 396 branch: default | 396 branch: default |
| 397 commit: 1 deleted, 2 unknown (clean) | 397 commit: 1 deleted, 2 unknown (clean) |
| 398 update: 2 new changesets, 2 branch heads (merge) | 398 update: 2 new changesets, 2 branch heads (merge) |
| 399 phases: 4 draft | 399 phases: 4 draft |
| 400 unstable: 1 changesets | 400 orphan: 1 changesets |
| 401 $ qlog | 401 $ qlog |
| 402 6 | 402 6 |
| 403 - 909a0fb57e5d | 403 - 909a0fb57e5d |
| 404 3 | 404 3 |
| 405 - 725c380fe99b | 405 - 725c380fe99b |
| 732 @ changeset: 17:a5f7a21fe7bc | 732 @ changeset: 17:a5f7a21fe7bc |
| 733 | tag: tip | 733 | tag: tip |
| 734 | parent: 2:4538525df7e2 | 734 | parent: 2:4538525df7e2 |
| 735 | user: test | 735 | user: test |
| 736 | date: Thu Jan 01 00:00:00 1970 +0000 | 736 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 737 | instability: unstable | 737 | instability: orphan |
| 738 | summary: add obsol_d'' | 738 | summary: add obsol_d'' |
| 739 | | 739 | |
| 740 | o changeset: 16:50f11e5e3a63 | 740 | o changeset: 16:50f11e5e3a63 |
| 741 | | parent: 11:9468a5f5d8b2 | 741 | | parent: 11:9468a5f5d8b2 |
| 742 | | user: test | 742 | | user: test |