comparison tests/test-evolve-cycles.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 87b83a3e0392
children 9c9c8c1eeb93 98941c28f3e2
comparison
equal deleted inserted replaced
3105:f5d472b7e800 3106:a867d59ea97a
48 summary: ROOT 48 summary: ROOT
49 49
50 Create a cycle 50 Create a cycle
51 $ hg prune -s "desc(B)" "desc(A)" 51 $ hg prune -s "desc(B)" "desc(A)"
52 1 changesets pruned 52 1 changesets pruned
53 2 new orphan changesets 53 2 new unstable changesets
54 $ hg prune -s "desc(C)" "desc(B)" 54 $ hg prune -s "desc(C)" "desc(B)"
55 1 changesets pruned 55 1 changesets pruned
56 $ hg prune -s "desc(A)" "desc(C)" 56 $ hg prune -s "desc(A)" "desc(C)"
57 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 57 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
58 working directory now at 2a34000d3544 58 working directory now at 2a34000d3544
186 summary: ROOT 186 summary: ROOT
187 187
188 Create a first cycle 188 Create a first cycle
189 $ hg prune -s "desc(B)" "desc(A)" 189 $ hg prune -s "desc(B)" "desc(A)"
190 1 changesets pruned 190 1 changesets pruned
191 5 new orphan changesets 191 5 new unstable changesets
192 $ hg prune -s "desc(C)" "desc(B)" 192 $ hg prune -s "desc(C)" "desc(B)"
193 1 changesets pruned 193 1 changesets pruned
194 $ hg prune --split -s "desc(A)" -s "desc(D)" "desc(C)" 194 $ hg prune --split -s "desc(A)" -s "desc(D)" "desc(C)"
195 1 changesets pruned 195 1 changesets pruned
196 And create a second one 196 And create a second one