58 |
58 |
59 |
59 |
60 evolve --rev reorders the rev to solve instability, trivial case 2 revs wrong order |
60 evolve --rev reorders the rev to solve instability, trivial case 2 revs wrong order |
61 $ hg evolve --rev 'desc(_c) + desc(_b)' |
61 $ hg evolve --rev 'desc(_c) + desc(_b)' |
62 move:[2] add _b |
62 move:[2] add _b |
63 atop:[5] add _a |
63 atop:[4] add _a |
64 move:[3] add _c |
64 move:[3] add _c |
65 atop:[6] add _b |
65 atop:[5] add _b |
66 working directory is now at 52b8f9b04f83 |
66 working directory is now at 52b8f9b04f83 |
67 |
67 |
68 evolve --rev reorders the rev to solve instability. Harder case, obsolescence |
68 evolve --rev reorders the rev to solve instability. Harder case, obsolescence |
69 accross three stacks in growing rev numbers. |
69 accross three stacks in growing rev numbers. |
70 $ hg up "desc(_c)" |
70 $ hg up "desc(_c)" |
71 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
71 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
72 $ mkcommit _d |
72 $ mkcommit _d |
73 $ hg up "desc(_a)" |
73 $ hg up "desc(_a)" |
74 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
74 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
75 $ hg amend -m "aprime" |
75 $ hg amend -m "aprime" |
76 3 new unstable changesets |
76 3 new orphan changesets |
77 $ hg evolve --rev "desc(_b)" |
77 $ hg evolve --rev "desc(_b)" |
78 move:[6] add _b |
78 move:[5] add _b |
79 atop:[9] aprime |
79 atop:[8] aprime |
80 working directory is now at 476c9c052aae |
80 working directory is now at 476c9c052aae |
81 $ hg up "desc(_b) - obsolete()" |
81 $ hg up "desc(_b) - obsolete()" |
82 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
82 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
83 $ hg amend -m "bprime" |
83 $ hg amend -m "bprime" |
84 $ hg up "desc(aprime)" |
84 $ hg up "desc(aprime)" |
85 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
85 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
86 $ hg amend -m "asecond" |
86 $ hg amend -m "asecond" |
87 1 new unstable changesets |
87 1 new orphan changesets |
88 $ hg log -G |
88 $ hg log -G |
89 @ 12:9a584314f3f3@default(draft) asecond |
89 @ 11:9a584314f3f3@default(draft) asecond |
90 | |
90 | |
91 | o 11:a59c79776f7c@default(draft) bprime |
91 | o 10:a59c79776f7c@default(draft) bprime |
92 | | |
92 | | |
93 | x 9:81a687b96d4d@default(draft) aprime |
93 | x 8:81a687b96d4d@default(draft) aprime |
94 |/ |
94 |/ |
95 | o 8:464731bc0ed0@default(draft) add _d |
95 | o 7:464731bc0ed0@default(draft) add _d |
96 | | |
96 | | |
97 | o 7:52b8f9b04f83@default(draft) add _c |
97 | o 6:52b8f9b04f83@default(draft) add _c |
98 | | |
98 | | |
99 | x 6:59476c3836ef@default(draft) add _b |
99 | x 5:59476c3836ef@default(draft) add _b |
100 | | |
100 | | |
101 | x 5:12d519679175@default(draft) add _a |
101 | x 4:12d519679175@default(draft) add _a |
102 |/ |
102 |/ |
103 o 0:f92638be10c7@default(public) add p |
103 o 0:f92638be10c7@default(public) add p |
104 |
104 |
105 $ hg evolve --rev "unstable()" |
105 $ hg evolve --rev "orphan()" |
106 move:[11] bprime |
106 move:[10] bprime |
107 atop:[12] asecond |
107 atop:[11] asecond |
108 move:[7] add _c |
108 move:[6] add _c |
109 atop:[13] bprime |
109 atop:[12] bprime |
110 move:[8] add _d |
110 move:[7] add _d |
111 atop:[14] add _c |
111 atop:[13] add _c |
112 working directory is now at 739f18ac1d03 |
112 working directory is now at 739f18ac1d03 |
113 $ hg log -G |
113 $ hg log -G |
114 @ 15:739f18ac1d03@default(draft) add _d |
114 @ 14:739f18ac1d03@default(draft) add _d |
115 | |
115 | |
116 o 14:e5960578d158@default(draft) add _c |
116 o 13:e5960578d158@default(draft) add _c |
117 | |
117 | |
118 o 13:4ad33fa88946@default(draft) bprime |
118 o 12:4ad33fa88946@default(draft) bprime |
119 | |
119 | |
120 o 12:9a584314f3f3@default(draft) asecond |
120 o 11:9a584314f3f3@default(draft) asecond |
121 | |
121 | |
122 o 0:f92638be10c7@default(public) add p |
122 o 0:f92638be10c7@default(public) add p |
123 |
123 |
124 |
124 |
125 Evolve --rev more complex case: two sets of stacks one with prune an no successor, the other one |
125 Evolve --rev more complex case: two sets of stacks one with prune an no successor, the other one |
129 $ mkstack "desc(_d)" c1_ c2_ c3_ c4_ >/dev/null |
129 $ mkstack "desc(_d)" c1_ c2_ c3_ c4_ >/dev/null |
130 $ mkstack "desc(_d)" c1prime c2prime >/dev/null |
130 $ mkstack "desc(_d)" c1prime c2prime >/dev/null |
131 $ mkstack "desc(_d)" c1second >/dev/null |
131 $ mkstack "desc(_d)" c1second >/dev/null |
132 $ hg prune "desc(c1_)" -s "desc(c1prime)" |
132 $ hg prune "desc(c1_)" -s "desc(c1prime)" |
133 1 changesets pruned |
133 1 changesets pruned |
134 3 new unstable changesets |
134 3 new orphan changesets |
135 $ hg prune "desc(c2_)" -s "desc(c2prime)" |
135 $ hg prune "desc(c2_)" -s "desc(c2prime)" |
136 1 changesets pruned |
136 1 changesets pruned |
137 $ hg prune "desc(c1prime)" -s "desc(c1second)" |
137 $ hg prune "desc(c1prime)" -s "desc(c1second)" |
138 1 changesets pruned |
138 1 changesets pruned |
139 1 new unstable changesets |
139 1 new orphan changesets |
140 $ hg log -G -r "desc(_d)::" |
140 $ hg log -G -r "desc(_d)::" |
141 @ 22:dcf786e878fd@default(draft) add c1second |
141 @ 21:dcf786e878fd@default(draft) add c1second |
142 | |
142 | |
143 | o 21:507d52d715f6@default(draft) add c2prime |
143 | o 20:507d52d715f6@default(draft) add c2prime |
144 | | |
144 | | |
145 | x 20:c995cb124ddc@default(draft) add c1prime |
145 | x 19:c995cb124ddc@default(draft) add c1prime |
146 |/ |
146 |/ |
147 | o 19:d096a2437fd0@default(draft) add c4_ |
147 | o 18:d096a2437fd0@default(draft) add c4_ |
148 | | |
148 | | |
149 | o 18:cde95c6cba7a@default(draft) add c3_ |
149 | o 17:cde95c6cba7a@default(draft) add c3_ |
150 | | |
150 | | |
151 | x 17:e0d9f7a099fe@default(draft) add c2_ |
151 | x 16:e0d9f7a099fe@default(draft) add c2_ |
152 | | |
152 | | |
153 | x 16:43b7c338b1f8@default(draft) add c1_ |
153 | x 15:43b7c338b1f8@default(draft) add c1_ |
154 |/ |
154 |/ |
155 o 15:739f18ac1d03@default(draft) add _d |
155 o 14:739f18ac1d03@default(draft) add _d |
156 | |
156 | |
157 ~ |
157 ~ |
158 |
158 |
159 Second set of stack with no successor for b2_: |
159 Second set of stack with no successor for b2_: |
160 $ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null |
160 $ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null |
161 $ mkstack "desc(_d)" b1prime b3prime >/dev/null |
161 $ mkstack "desc(_d)" b1prime b3prime >/dev/null |
162 $ hg prune "desc(b1_)" -s "desc(b1prime)" |
162 $ hg prune "desc(b1_)" -s "desc(b1prime)" |
163 1 changesets pruned |
163 1 changesets pruned |
164 3 new unstable changesets |
164 3 new orphan changesets |
165 $ hg prune "desc(b3_)" -s "desc(b3prime)" |
165 $ hg prune "desc(b3_)" -s "desc(b3prime)" |
166 1 changesets pruned |
166 1 changesets pruned |
167 $ hg prune "desc(b2_)" |
167 $ hg prune "desc(b2_)" |
168 1 changesets pruned |
168 1 changesets pruned |
169 |
169 |
170 $ hg log -G -r "desc(_d)::" |
170 $ hg log -G -r "desc(_d)::" |
171 @ 28:b253ff5b65d1@default(draft) add b3prime |
171 @ 27:b253ff5b65d1@default(draft) add b3prime |
172 | |
172 | |
173 o 27:4acf61f11dfb@default(draft) add b1prime |
173 o 26:4acf61f11dfb@default(draft) add b1prime |
174 | |
174 | |
175 | o 26:594e1fbbd61f@default(draft) add b4_ |
175 | o 25:594e1fbbd61f@default(draft) add b4_ |
176 | | |
176 | | |
177 | x 25:be27500cfc76@default(draft) add b3_ |
177 | x 24:be27500cfc76@default(draft) add b3_ |
178 | | |
178 | | |
179 | x 24:b54f77dc5831@default(draft) add b2_ |
179 | x 23:b54f77dc5831@default(draft) add b2_ |
180 | | |
180 | | |
181 | x 23:0e1eba27e9aa@default(draft) add b1_ |
181 | x 22:0e1eba27e9aa@default(draft) add b1_ |
182 |/ |
182 |/ |
183 | o 22:dcf786e878fd@default(draft) add c1second |
183 | o 21:dcf786e878fd@default(draft) add c1second |
184 |/ |
184 |/ |
185 | o 21:507d52d715f6@default(draft) add c2prime |
185 | o 20:507d52d715f6@default(draft) add c2prime |
186 | | |
186 | | |
187 | x 20:c995cb124ddc@default(draft) add c1prime |
187 | x 19:c995cb124ddc@default(draft) add c1prime |
188 |/ |
188 |/ |
189 | o 19:d096a2437fd0@default(draft) add c4_ |
189 | o 18:d096a2437fd0@default(draft) add c4_ |
190 | | |
190 | | |
191 | o 18:cde95c6cba7a@default(draft) add c3_ |
191 | o 17:cde95c6cba7a@default(draft) add c3_ |
192 | | |
192 | | |
193 | x 17:e0d9f7a099fe@default(draft) add c2_ |
193 | x 16:e0d9f7a099fe@default(draft) add c2_ |
194 | | |
194 | | |
195 | x 16:43b7c338b1f8@default(draft) add c1_ |
195 | x 15:43b7c338b1f8@default(draft) add c1_ |
196 |/ |
196 |/ |
197 o 15:739f18ac1d03@default(draft) add _d |
197 o 14:739f18ac1d03@default(draft) add _d |
198 | |
198 | |
199 ~ |
199 ~ |
200 |
200 |
201 Solve the full second stack and only part of the first one |
201 Solve the full second stack and only part of the first one |
202 $ echo "(desc(_d)::) - desc(c3_)" |
202 $ echo "(desc(_d)::) - desc(c3_)" |
203 (desc(_d)::) - desc(c3_) |
203 (desc(_d)::) - desc(c3_) |
204 $ hg evolve --rev "(desc(_d)::) - desc(c3_)" |
204 $ hg evolve --rev "(desc(_d)::) - desc(c3_)" |
205 cannot solve instability of d096a2437fd0, skipping |
205 cannot solve instability of d096a2437fd0, skipping |
206 move:[21] add c2prime |
206 move:[20] add c2prime |
207 atop:[22] add c1second |
207 atop:[21] add c1second |
208 move:[26] add b4_ |
208 move:[25] add b4_ |
209 atop:[28] add b3prime |
209 atop:[27] add b3prime |
210 working directory is now at ea93190a9cd1 |
210 working directory is now at ea93190a9cd1 |
211 |
211 |
212 Cleanup |
212 Cleanup |
213 $ hg evolve --rev "(desc(_d)::)" |
213 $ hg evolve --rev "(desc(_d)::)" |
214 move:[18] add c3_ |
214 move:[17] add c3_ |
215 atop:[29] add c2prime |
215 atop:[28] add c2prime |
216 move:[19] add c4_ |
216 move:[18] add c4_ |
217 atop:[31] add c3_ |
217 atop:[30] add c3_ |
218 working directory is now at 35e7b797ace5 |
218 working directory is now at 35e7b797ace5 |
219 $ hg log -G -r "desc(_d)::" |
219 $ hg log -G -r "desc(_d)::" |
220 @ 32:35e7b797ace5@default(draft) add c4_ |
220 @ 31:35e7b797ace5@default(draft) add c4_ |
221 | |
221 | |
222 o 31:0b9488394e89@default(draft) add c3_ |
222 o 30:0b9488394e89@default(draft) add c3_ |
223 | |
223 | |
224 | o 30:ea93190a9cd1@default(draft) add b4_ |
224 | o 29:ea93190a9cd1@default(draft) add b4_ |
225 | | |
225 | | |
226 o | 29:881b9c092e53@default(draft) add c2prime |
226 o | 28:881b9c092e53@default(draft) add c2prime |
227 | | |
227 | | |
228 | o 28:b253ff5b65d1@default(draft) add b3prime |
228 | o 27:b253ff5b65d1@default(draft) add b3prime |
229 | | |
229 | | |
230 | o 27:4acf61f11dfb@default(draft) add b1prime |
230 | o 26:4acf61f11dfb@default(draft) add b1prime |
231 | | |
231 | | |
232 o | 22:dcf786e878fd@default(draft) add c1second |
232 o | 21:dcf786e878fd@default(draft) add c1second |
233 |/ |
233 |/ |
234 o 15:739f18ac1d03@default(draft) add _d |
234 o 14:739f18ac1d03@default(draft) add _d |
235 | |
235 | |
236 ~ |
236 ~ |
237 |
237 |
238 Test multiple revision with some un-evolvable because parent is splitted |
238 Test multiple revision with some un-evolvable because parent is splitted |
239 ------------------------------------------------------------------------ |
239 ------------------------------------------------------------------------ |
242 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
242 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
243 $ mkcommit c3part1 |
243 $ mkcommit c3part1 |
244 created new head |
244 created new head |
245 $ hg prev |
245 $ hg prev |
246 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
246 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
247 [29] add c2prime |
247 [28] add c2prime |
248 $ mkcommit c3part2 |
248 $ mkcommit c3part2 |
249 created new head |
249 created new head |
250 $ hg prune -s 'desc(c3part1)' 'desc(c3_)' |
250 $ hg prune -s 'desc(c3part1)' 'desc(c3_)' |
251 1 changesets pruned |
251 1 changesets pruned |
252 1 new unstable changesets |
252 1 new orphan changesets |
253 $ hg prune -s 'desc(c3part2)' 'desc(c3_)' |
253 $ hg prune -s 'desc(c3part2)' 'desc(c3_)' |
254 1 changesets pruned |
254 1 changesets pruned |
255 2 new divergent changesets |
255 2 new content-divergent changesets |
256 $ hg up 'desc(b3prime)' |
256 $ hg up 'desc(b3prime)' |
257 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
257 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
258 $ hg amend -m 'b3second' |
258 $ hg amend -m 'b3second' |
259 1 new unstable changesets |
259 1 new orphan changesets |
260 $ hg evolve --rev 'unstable()' |
260 $ hg evolve --rev "orphan()" |
261 move:[30] add b4_ |
261 move:[29] add b4_ |
262 atop:[35] b3second |
262 atop:[34] b3second |
263 skipping 0b9488394e89: divergent rewriting. can't choose destination |
263 skipping 0b9488394e89: divergent rewriting. can't choose destination |
264 working directory is now at 31809a198477 |
264 working directory is now at 31809a198477 |
265 |
265 |