Mercurial > evolve

comparison tests/test-evolve-order.t @ 6401:716912541759 mercurial-5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 07 Feb 2023 10:51:10 +0400
parents 53d63b608230
children
comparison
equal deleted inserted replaced
6355:4cf673319dfc 6401:716912541759
93 $ hg evolve --rev "orphan()" --update 93 $ hg evolve --rev "orphan()" --update
94 move:[10] bprime 94 move:[10] bprime
95 atop:[11] asecond 95 atop:[11] asecond
96 move:[6] add _c 96 move:[6] add _c
97 move:[7] add _d 97 move:[7] add _d
98 working directory is now at 739f18ac1d03 98 working directory is now at 225d2cc5d3fc
99 $ hg log -G 99 $ hg log -G
100 @ 14:739f18ac1d03@default(draft) add _d 100 @ 14:225d2cc5d3fc@default(draft) add _d
101 | 101 |
102 o 13:e5960578d158@default(draft) add _c 102 o 13:0fc229278e4d@default(draft) add _c
103 | 103 |
104 o 12:4ad33fa88946@default(draft) bprime 104 o 12:c3741b9eafae@default(draft) bprime
105 | 105 |
106 o 11:9a584314f3f3@default(draft) asecond 106 o 11:9a584314f3f3@default(draft) asecond
107 | 107 |
108 o 0:f92638be10c7@default(public) add p 108 o 0:f92638be10c7@default(public) add p
109 109
122 1 changesets pruned 122 1 changesets pruned
123 $ hg prune "desc(c1prime)" -s "desc(c1second)" 123 $ hg prune "desc(c1prime)" -s "desc(c1second)"
124 1 changesets pruned 124 1 changesets pruned
125 1 new orphan changesets 125 1 new orphan changesets
126 $ hg log -G -r "desc(_d)::" 126 $ hg log -G -r "desc(_d)::"
127 @ 21:dcf786e878fd@default(draft) add c1second 127 @ 21:a329855d0bc1@default(draft) add c1second
128 | 128 |
129 | * 20:507d52d715f6@default(draft) add c2prime 129 | * 20:072276ece1bf@default(draft) add c2prime
130 | | 130 | |
131 | x 19:c995cb124ddc@default(draft) add c1prime 131 | x 19:f137acd06692@default(draft) add c1prime
132 |/ 132 |/
133 | * 18:d096a2437fd0@default(draft) add c4_ 133 | * 18:0a1d9b2ce733@default(draft) add c4_
134 | | 134 | |
135 | * 17:cde95c6cba7a@default(draft) add c3_ 135 | * 17:e2874f41c56c@default(draft) add c3_
136 | | 136 | |
137 | x 16:e0d9f7a099fe@default(draft) add c2_ 137 | x 16:3247c33339fa@default(draft) add c2_
138 | | 138 | |
139 | x 15:43b7c338b1f8@default(draft) add c1_ 139 | x 15:df322257c182@default(draft) add c1_
140 |/ 140 |/
141 o 14:739f18ac1d03@default(draft) add _d 141 o 14:225d2cc5d3fc@default(draft) add _d
142 | 142 |
143 ~ 143 ~
144 144
145 Second set of stack with no successor for b2_: 145 Second set of stack with no successor for b2_:
146 $ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null 146 $ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null
152 1 changesets pruned 152 1 changesets pruned
153 $ hg prune "desc(b2_)" 153 $ hg prune "desc(b2_)"
154 1 changesets pruned 154 1 changesets pruned
155 155
156 $ hg log -G -r "desc(_d)::" 156 $ hg log -G -r "desc(_d)::"
157 @ 27:b253ff5b65d1@default(draft) add b3prime 157 @ 27:ba4c348b6d5e@default(draft) add b3prime
158 | 158 |
159 o 26:4acf61f11dfb@default(draft) add b1prime 159 o 26:8fe985f5d0aa@default(draft) add b1prime
160 | 160 |
161 | * 25:594e1fbbd61f@default(draft) add b4_ 161 | * 25:1d9ba2e75c93@default(draft) add b4_
162 | | 162 | |
163 | x 24:be27500cfc76@default(draft) add b3_ 163 | x 24:aec6a9657b6c@default(draft) add b3_
164 | | 164 | |
165 | x 23:b54f77dc5831@default(draft) add b2_ 165 | x 23:a69b58575918@default(draft) add b2_
166 | | 166 | |
167 | x 22:0e1eba27e9aa@default(draft) add b1_ 167 | x 22:3564eb18e448@default(draft) add b1_
168 |/ 168 |/
169 | o 21:dcf786e878fd@default(draft) add c1second 169 | o 21:a329855d0bc1@default(draft) add c1second
170 |/ 170 |/
171 | * 20:507d52d715f6@default(draft) add c2prime 171 | * 20:072276ece1bf@default(draft) add c2prime
172 | | 172 | |
173 | x 19:c995cb124ddc@default(draft) add c1prime 173 | x 19:f137acd06692@default(draft) add c1prime
174 |/ 174 |/
175 | * 18:d096a2437fd0@default(draft) add c4_ 175 | * 18:0a1d9b2ce733@default(draft) add c4_
176 | | 176 | |
177 | * 17:cde95c6cba7a@default(draft) add c3_ 177 | * 17:e2874f41c56c@default(draft) add c3_
178 | | 178 | |
179 | x 16:e0d9f7a099fe@default(draft) add c2_ 179 | x 16:3247c33339fa@default(draft) add c2_
180 | | 180 | |
181 | x 15:43b7c338b1f8@default(draft) add c1_ 181 | x 15:df322257c182@default(draft) add c1_
182 |/ 182 |/
183 o 14:739f18ac1d03@default(draft) add _d 183 o 14:225d2cc5d3fc@default(draft) add _d
184 | 184 |
185 ~ 185 ~
186 186
187 Solve the full second stack and only part of the first one 187 Solve the full second stack and only part of the first one
188 $ echo "(desc(_d)::) - desc(c3_)" 188 $ echo "(desc(_d)::) - desc(c3_)"
189 (desc(_d)::) - desc(c3_) 189 (desc(_d)::) - desc(c3_)
190 $ hg evolve --rev "(desc(_d)::) - desc(c3_)" 190 $ hg evolve --rev "(desc(_d)::) - desc(c3_)"
191 skipping d096a2437fd0, consider including orphan ancestors 191 skipping 0a1d9b2ce733, consider including orphan ancestors
192 move:[20] add c2prime 192 move:[20] add c2prime
193 atop:[21] add c1second 193 atop:[21] add c1second
194 move:[25] add b4_ 194 move:[25] add b4_
195 atop:[27] add b3prime 195 atop:[27] add b3prime
196 196
197 Cleanup 197 Cleanup
198 $ hg evolve --rev "(desc(_d)::)" --update 198 $ hg evolve --rev "(desc(_d)::)" --update
199 move:[17] add c3_ 199 move:[17] add c3_
200 atop:[28] add c2prime 200 atop:[28] add c2prime
201 move:[18] add c4_ 201 move:[18] add c4_
202 working directory is now at 35e7b797ace5 202 working directory is now at 4ee8feb52325
203 $ hg log -G -r "desc(_d)::" 203 $ hg log -G -r "desc(_d)::"
204 @ 31:35e7b797ace5@default(draft) add c4_ 204 @ 31:4ee8feb52325@default(draft) add c4_
205 | 205 |
206 o 30:0b9488394e89@default(draft) add c3_ 206 o 30:08a530ce67e1@default(draft) add c3_
207 | 207 |
208 | o 29:ea93190a9cd1@default(draft) add b4_ 208 | o 29:4897c8ed7645@default(draft) add b4_
209 | | 209 | |
210 o | 28:881b9c092e53@default(draft) add c2prime 210 o | 28:3abc7618dd5f@default(draft) add c2prime
211 | | 211 | |
212 | o 27:b253ff5b65d1@default(draft) add b3prime 212 | o 27:ba4c348b6d5e@default(draft) add b3prime
213 | | 213 | |
214 | o 26:4acf61f11dfb@default(draft) add b1prime 214 | o 26:8fe985f5d0aa@default(draft) add b1prime
215 | | 215 | |
216 o | 21:dcf786e878fd@default(draft) add c1second 216 o | 21:a329855d0bc1@default(draft) add c1second
217 |/ 217 |/
218 o 14:739f18ac1d03@default(draft) add _d 218 o 14:225d2cc5d3fc@default(draft) add _d
219 | 219 |
220 ~ 220 ~
221 221
222 Test multiple revision with some un-evolvable because parent is split 222 Test multiple revision with some un-evolvable because parent is split
223 --------------------------------------------------------------------- 223 ---------------------------------------------------------------------
242 $ hg amend -m 'b3second' 242 $ hg amend -m 'b3second'
243 1 new orphan changesets 243 1 new orphan changesets
244 $ hg evolve --rev "orphan()" 244 $ hg evolve --rev "orphan()"
245 move:[29] add b4_ 245 move:[29] add b4_
246 atop:[34] b3second 246 atop:[34] b3second
247 skipping 0b9488394e89: divergent rewriting. can't choose destination 247 skipping 08a530ce67e1: divergent rewriting. can't choose destination