Mercurial > evolve
comparison tests/test-evolve-list.t @ 3106:a867d59ea97a mercurial-4.3
test-compat: revert output changes from phase renaming
We keep using the old name for the older version. test has to reflect that.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 20:04:13 +0200 |
| parents | 945a0989e41b |
| children | 85cdce113c2c |
comparison
equal
deleted
inserted
replaced
| 3105:f5d472b7e800 | 3106:a867d59ea97a |
|---|---|
| 15 $ echo c > c && hg ci -Am c | 15 $ echo c > c && hg ci -Am c |
| 16 adding c | 16 adding c |
| 17 $ hg up 0 | 17 $ hg up 0 |
| 18 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 18 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 19 $ echo a >> a && hg ci --amend -m a | 19 $ echo a >> a && hg ci --amend -m a |
| 20 2 new orphan changesets | 20 2 new unstable changesets |
| 21 $ hg evolve --list | 21 $ hg evolve --list |
| 22 d2ae7f538514: b | 22 d2ae7f538514: b |
| 23 unstable: cb9a9f314b8b (obsolete parent) | 23 unstable: cb9a9f314b8b (obsolete parent) |
| 24 | 24 |
| 25 177f92b77385: c | 25 177f92b77385: c |
| 32 $ cd r3 | 32 $ cd r3 |
| 33 $ echo a > a && hg ci -Am a | 33 $ echo a > a && hg ci -Am a |
| 34 adding a | 34 adding a |
| 35 $ echo b > b && hg ci --amend -m ab | 35 $ echo b > b && hg ci --amend -m ab |
| 36 $ hg phase --public --rev 0 --hidden | 36 $ hg phase --public --rev 0 --hidden |
| 37 1 new phase-divergent changesets | 37 1 new bumped changesets |
| 38 $ hg evolve --list | 38 $ hg evolve --list |
| 39 88cc282e27fc: ab | 39 88cc282e27fc: ab |
| 40 bumped: cb9a9f314b8b (immutable precursor) | 40 bumped: cb9a9f314b8b (immutable precursor) |
| 41 | 41 |
| 42 $ cd .. | 42 $ cd .. |
| 62 created new head | 62 created new head |
| 63 $ hg rebase -s 1 -d 2 | 63 $ hg rebase -s 1 -d 2 |
| 64 rebasing 1:d2ae7f538514 "b" | 64 rebasing 1:d2ae7f538514 "b" |
| 65 $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True | 65 $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True |
| 66 rebasing 1:d2ae7f538514 "b" | 66 rebasing 1:d2ae7f538514 "b" |
| 67 2 new content-divergent changesets | 67 2 new divergent changesets |
| 68 $ hg evolve --list | 68 $ hg evolve --list |
| 69 c882616e9d84: b | 69 c882616e9d84: b |
| 70 divergent: a922b3733e98 (draft) (precursor d2ae7f538514) | 70 divergent: a922b3733e98 (draft) (precursor d2ae7f538514) |
| 71 | 71 |
| 72 a922b3733e98: b | 72 a922b3733e98: b |