Mercurial > evolve
comparison tests/test-divergent.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 | f5d472b7e800 |
| children | e1a230cc4527 |
comparison
equal
deleted
inserted
replaced
| 3105:f5d472b7e800 | 3106:a867d59ea97a |
|---|---|
| 43 created new head | 43 created new head |
| 44 $ hg prune -s "desc(bdivergent1)" "desc(_b)" | 44 $ hg prune -s "desc(bdivergent1)" "desc(_b)" |
| 45 1 changesets pruned | 45 1 changesets pruned |
| 46 $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden | 46 $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden |
| 47 1 changesets pruned | 47 1 changesets pruned |
| 48 2 new content-divergent changesets | 48 2 new divergent changesets |
| 49 $ hg log -G | 49 $ hg log -G |
| 50 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent] | 50 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent] |
| 51 | | 51 | |
| 52 | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] | 52 | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] |
| 53 |/ | 53 |/ |
| 86 created new head | 86 created new head |
| 87 $ hg prune -s "desc(cdivergent1)" "desc(_c)" | 87 $ hg prune -s "desc(cdivergent1)" "desc(_c)" |
| 88 1 changesets pruned | 88 1 changesets pruned |
| 89 $ hg prune -s "desc(cdivergent2)" "desc(_c)" --hidden | 89 $ hg prune -s "desc(cdivergent2)" "desc(_c)" --hidden |
| 90 1 changesets pruned | 90 1 changesets pruned |
| 91 2 new content-divergent changesets | 91 2 new divergent changesets |
| 92 $ hg log -G | 92 $ hg log -G |
| 93 @ 8:0a768ef678d9@default(draft) cdivergent2 [content-divergent] | 93 @ 8:0a768ef678d9@default(draft) cdivergent2 [content-divergent] |
| 94 | | 94 | |
| 95 | o 7:26c7705fee96@default(draft) add cdivergent1 [content-divergent] | 95 | o 7:26c7705fee96@default(draft) add cdivergent1 [content-divergent] |
| 96 |/ | 96 |/ |
| 122 created new head | 122 created new head |
| 123 $ hg prune -s "desc(bdivergent1)" "desc(_b)" | 123 $ hg prune -s "desc(bdivergent1)" "desc(_b)" |
| 124 1 changesets pruned | 124 1 changesets pruned |
| 125 $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden | 125 $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden |
| 126 1 changesets pruned | 126 1 changesets pruned |
| 127 2 new content-divergent changesets | 127 2 new divergent changesets |
| 128 $ hg log -G | 128 $ hg log -G |
| 129 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent] | 129 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent] |
| 130 | | 130 | |
| 131 | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] | 131 | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] |
| 132 |/ | 132 |/ |