Mercurial > evolve

comparison tests/test-evolve-order.t @ 4363:a2fdbece7ce1 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 22 Jan 2019 12:57:25 -0500
parents e268f7fd7839
children f54bb6eaf5e6
comparison
equal deleted inserted replaced
4362:8bd60e09dfb4 4363:a2fdbece7ce1
42 $ hg phase --public 0 42 $ hg phase --public 0
43 $ hg up 'desc(_a)' 43 $ hg up 'desc(_a)'
44 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 44 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
45 $ echo "aaa" > _a 45 $ echo "aaa" > _a
46 $ hg amend 46 $ hg amend
47 2 new orphan changesets
48 $ hg log -G 47 $ hg log -G
49 @ 4:12d519679175@default(draft) add _a 48 @ 4:12d519679175@default(draft) add _a
50 | 49 |
51 | * 3:4d156641b718@default(draft) add _c 50 | o 3:4d156641b718@default(draft) add _c
52 | | 51 | |
53 | * 2:4d7242ebb004@default(draft) add _b 52 | o 2:4d7242ebb004@default(draft) add _b
54 | | 53 | |
55 | x 1:2d73fcd7f07d@default(draft) add _a 54 | x 1:2d73fcd7f07d@default(draft) add _a
56 |/ 55 |/
57 o 0:f92638be10c7@default(public) add p 56 o 0:f92638be10c7@default(public) add p
58 57
70 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 69 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
71 $ mkcommit _d 70 $ mkcommit _d
72 $ hg up "desc(_a)" 71 $ hg up "desc(_a)"
73 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 72 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
74 $ hg amend -m "aprime" 73 $ hg amend -m "aprime"
75 3 new orphan changesets
76 $ hg evolve --rev "desc(_b)" 74 $ hg evolve --rev "desc(_b)"
77 move:[5] add _b 75 move:[5] add _b
78 atop:[8] aprime 76 atop:[8] aprime
79 working directory is now at 476c9c052aae 77 working directory is now at 476c9c052aae
80 $ hg up "desc(_b) - obsolete()" 78 $ hg up "desc(_b) - obsolete()"
81 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 79 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
82 $ hg amend -m "bprime" 80 $ hg amend -m "bprime"
83 $ hg up "desc(aprime)" 81 $ hg up "desc(aprime)"
84 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 82 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
85 $ hg amend -m "asecond" 83 $ hg amend -m "asecond"
86 1 new orphan changesets
87 $ hg log -G 84 $ hg log -G
88 @ 11:9a584314f3f3@default(draft) asecond 85 @ 11:9a584314f3f3@default(draft) asecond
89 | 86 |
90 | * 10:a59c79776f7c@default(draft) bprime 87 | o 10:a59c79776f7c@default(draft) bprime
91 | | 88 | |
92 | x 8:81a687b96d4d@default(draft) aprime 89 | x 8:81a687b96d4d@default(draft) aprime
93 |/ 90 |/
94 | * 7:464731bc0ed0@default(draft) add _d 91 | o 7:464731bc0ed0@default(draft) add _d
95 | | 92 | |
96 | * 6:52b8f9b04f83@default(draft) add _c 93 | o 6:52b8f9b04f83@default(draft) add _c
97 | | 94 | |
98 | x 5:59476c3836ef@default(draft) add _b 95 | x 5:59476c3836ef@default(draft) add _b
99 | | 96 | |
100 | x 4:12d519679175@default(draft) add _a 97 | x 4:12d519679175@default(draft) add _a
101 |/ 98 |/
126 $ mkstack "desc(_d)" c1_ c2_ c3_ c4_ >/dev/null 123 $ mkstack "desc(_d)" c1_ c2_ c3_ c4_ >/dev/null
127 $ mkstack "desc(_d)" c1prime c2prime >/dev/null 124 $ mkstack "desc(_d)" c1prime c2prime >/dev/null
128 $ mkstack "desc(_d)" c1second >/dev/null 125 $ mkstack "desc(_d)" c1second >/dev/null
129 $ hg prune "desc(c1_)" -s "desc(c1prime)" 126 $ hg prune "desc(c1_)" -s "desc(c1prime)"
130 1 changesets pruned 127 1 changesets pruned
131 3 new orphan changesets
132 $ hg prune "desc(c2_)" -s "desc(c2prime)" 128 $ hg prune "desc(c2_)" -s "desc(c2prime)"
133 1 changesets pruned 129 1 changesets pruned
134 $ hg prune "desc(c1prime)" -s "desc(c1second)" 130 $ hg prune "desc(c1prime)" -s "desc(c1second)"
135 1 changesets pruned 131 1 changesets pruned
136 1 new orphan changesets
137 $ hg log -G -r "desc(_d)::" 132 $ hg log -G -r "desc(_d)::"
138 @ 21:dcf786e878fd@default(draft) add c1second 133 @ 21:dcf786e878fd@default(draft) add c1second
139 | 134 |
140 | * 20:507d52d715f6@default(draft) add c2prime 135 | o 20:507d52d715f6@default(draft) add c2prime
141 | | 136 | |
142 | x 19:c995cb124ddc@default(draft) add c1prime 137 | x 19:c995cb124ddc@default(draft) add c1prime
143 |/ 138 |/
144 | * 18:d096a2437fd0@default(draft) add c4_ 139 | o 18:d096a2437fd0@default(draft) add c4_
145 | | 140 | |
146 | * 17:cde95c6cba7a@default(draft) add c3_ 141 | o 17:cde95c6cba7a@default(draft) add c3_
147 | | 142 | |
148 | x 16:e0d9f7a099fe@default(draft) add c2_ 143 | x 16:e0d9f7a099fe@default(draft) add c2_
149 | | 144 | |
150 | x 15:43b7c338b1f8@default(draft) add c1_ 145 | x 15:43b7c338b1f8@default(draft) add c1_
151 |/ 146 |/
156 Second set of stack with no successor for b2_: 151 Second set of stack with no successor for b2_:
157 $ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null 152 $ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null
158 $ mkstack "desc(_d)" b1prime b3prime >/dev/null 153 $ mkstack "desc(_d)" b1prime b3prime >/dev/null
159 $ hg prune "desc(b1_)" -s "desc(b1prime)" 154 $ hg prune "desc(b1_)" -s "desc(b1prime)"
160 1 changesets pruned 155 1 changesets pruned
161 3 new orphan changesets
162 $ hg prune "desc(b3_)" -s "desc(b3prime)" 156 $ hg prune "desc(b3_)" -s "desc(b3prime)"
163 1 changesets pruned 157 1 changesets pruned
164 $ hg prune "desc(b2_)" 158 $ hg prune "desc(b2_)"
165 1 changesets pruned 159 1 changesets pruned
166 160
167 $ hg log -G -r "desc(_d)::" 161 $ hg log -G -r "desc(_d)::"
168 @ 27:b253ff5b65d1@default(draft) add b3prime 162 @ 27:b253ff5b65d1@default(draft) add b3prime
169 | 163 |
170 o 26:4acf61f11dfb@default(draft) add b1prime 164 o 26:4acf61f11dfb@default(draft) add b1prime
171 | 165 |
172 | * 25:594e1fbbd61f@default(draft) add b4_ 166 | o 25:594e1fbbd61f@default(draft) add b4_
173 | | 167 | |
174 | x 24:be27500cfc76@default(draft) add b3_ 168 | x 24:be27500cfc76@default(draft) add b3_
175 | | 169 | |
176 | x 23:b54f77dc5831@default(draft) add b2_ 170 | x 23:b54f77dc5831@default(draft) add b2_
177 | | 171 | |
178 | x 22:0e1eba27e9aa@default(draft) add b1_ 172 | x 22:0e1eba27e9aa@default(draft) add b1_
179 |/ 173 |/
180 | o 21:dcf786e878fd@default(draft) add c1second 174 | o 21:dcf786e878fd@default(draft) add c1second
181 |/ 175 |/
182 | * 20:507d52d715f6@default(draft) add c2prime 176 | o 20:507d52d715f6@default(draft) add c2prime
183 | | 177 | |
184 | x 19:c995cb124ddc@default(draft) add c1prime 178 | x 19:c995cb124ddc@default(draft) add c1prime
185 |/ 179 |/
186 | * 18:d096a2437fd0@default(draft) add c4_ 180 | o 18:d096a2437fd0@default(draft) add c4_
187 | | 181 | |
188 | * 17:cde95c6cba7a@default(draft) add c3_ 182 | o 17:cde95c6cba7a@default(draft) add c3_
189 | | 183 | |
190 | x 16:e0d9f7a099fe@default(draft) add c2_ 184 | x 16:e0d9f7a099fe@default(draft) add c2_
191 | | 185 | |
192 | x 15:43b7c338b1f8@default(draft) add c1_ 186 | x 15:43b7c338b1f8@default(draft) add c1_
193 |/ 187 |/
243 [28] add c2prime 237 [28] add c2prime
244 $ mkcommit c3part2 238 $ mkcommit c3part2
245 created new head 239 created new head
246 $ hg prune -s 'desc(c3part1)' 'desc(c3_)' 240 $ hg prune -s 'desc(c3part1)' 'desc(c3_)'
247 1 changesets pruned 241 1 changesets pruned
248 1 new orphan changesets
249 $ hg prune -s 'desc(c3part2)' 'desc(c3_)' 242 $ hg prune -s 'desc(c3part2)' 'desc(c3_)'
250 1 changesets pruned 243 1 changesets pruned
251 2 new content-divergent changesets
252 $ hg up 'desc(b3prime)' 244 $ hg up 'desc(b3prime)'
253 2 files updated, 0 files merged, 3 files removed, 0 files unresolved 245 2 files updated, 0 files merged, 3 files removed, 0 files unresolved
254 $ hg amend -m 'b3second' 246 $ hg amend -m 'b3second'
255 1 new orphan changesets
256 $ hg evolve --rev "orphan()" 247 $ hg evolve --rev "orphan()"
257 move:[29] add b4_ 248 move:[29] add b4_
258 atop:[34] b3second 249 atop:[34] b3second
259 skipping 0b9488394e89: divergent rewriting. can't choose destination 250 skipping 0b9488394e89: divergent rewriting. can't choose destination
260 working directory is now at 31809a198477 251 working directory is now at 31809a198477