equal
deleted
inserted
replaced
191 () draft |
191 () draft |
192 |
192 |
193 $ hg evolve --dry-run <<EOF |
193 $ hg evolve --dry-run <<EOF |
194 > 1 |
194 > 1 |
195 > EOF |
195 > EOF |
196 ancestor 'd48a30875f01' split over multiple topological branches. |
196 ancestor of 'd48a30875f01' split over multiple topological branches. |
197 choose an evolve destination: |
197 choose an evolve destination: |
198 1: [f2632392aefe] added a b c |
198 1: [f2632392aefe] added a b c |
199 2: [7f87764e5b64] added a b c |
199 2: [7f87764e5b64] added a b c |
200 q: quit the prompt |
200 q: quit the prompt |
201 enter the index of the revision you want to select: 1 |
201 enter the index of the revision you want to select: 1 |
204 hg rebase -r d48a30875f01 -d f2632392aefe |
204 hg rebase -r d48a30875f01 -d f2632392aefe |
205 |
205 |
206 $ hg evolve --dry-run <<EOF |
206 $ hg evolve --dry-run <<EOF |
207 > 2 |
207 > 2 |
208 > EOF |
208 > EOF |
209 ancestor 'd48a30875f01' split over multiple topological branches. |
209 ancestor of 'd48a30875f01' split over multiple topological branches. |
210 choose an evolve destination: |
210 choose an evolve destination: |
211 1: [f2632392aefe] added a b c |
211 1: [f2632392aefe] added a b c |
212 2: [7f87764e5b64] added a b c |
212 2: [7f87764e5b64] added a b c |
213 q: quit the prompt |
213 q: quit the prompt |
214 enter the index of the revision you want to select: 2 |
214 enter the index of the revision you want to select: 2 |
220 (this should move its own test file when we use it at multiple places) |
220 (this should move its own test file when we use it at multiple places) |
221 |
221 |
222 $ hg evolve --all <<EOF |
222 $ hg evolve --all <<EOF |
223 > foo |
223 > foo |
224 > EOF |
224 > EOF |
225 ancestor 'd48a30875f01' split over multiple topological branches. |
225 ancestor of 'd48a30875f01' split over multiple topological branches. |
226 choose an evolve destination: |
226 choose an evolve destination: |
227 1: [f2632392aefe] added a b c |
227 1: [f2632392aefe] added a b c |
228 2: [7f87764e5b64] added a b c |
228 2: [7f87764e5b64] added a b c |
229 q: quit the prompt |
229 q: quit the prompt |
230 enter the index of the revision you want to select: foo |
230 enter the index of the revision you want to select: foo |
232 could not solve instability, ambiguous destination: parent split across two branches |
232 could not solve instability, ambiguous destination: parent split across two branches |
233 |
233 |
234 $ hg evolve --all <<EOF |
234 $ hg evolve --all <<EOF |
235 > 4 |
235 > 4 |
236 > EOF |
236 > EOF |
237 ancestor 'd48a30875f01' split over multiple topological branches. |
237 ancestor of 'd48a30875f01' split over multiple topological branches. |
238 choose an evolve destination: |
238 choose an evolve destination: |
239 1: [f2632392aefe] added a b c |
239 1: [f2632392aefe] added a b c |
240 2: [7f87764e5b64] added a b c |
240 2: [7f87764e5b64] added a b c |
241 q: quit the prompt |
241 q: quit the prompt |
242 enter the index of the revision you want to select: 4 |
242 enter the index of the revision you want to select: 4 |
244 could not solve instability, ambiguous destination: parent split across two branches |
244 could not solve instability, ambiguous destination: parent split across two branches |
245 |
245 |
246 $ hg evolve --all <<EOF |
246 $ hg evolve --all <<EOF |
247 > -1 |
247 > -1 |
248 > EOF |
248 > EOF |
249 ancestor 'd48a30875f01' split over multiple topological branches. |
249 ancestor of 'd48a30875f01' split over multiple topological branches. |
250 choose an evolve destination: |
250 choose an evolve destination: |
251 1: [f2632392aefe] added a b c |
251 1: [f2632392aefe] added a b c |
252 2: [7f87764e5b64] added a b c |
252 2: [7f87764e5b64] added a b c |
253 q: quit the prompt |
253 q: quit the prompt |
254 enter the index of the revision you want to select: -1 |
254 enter the index of the revision you want to select: -1 |
256 could not solve instability, ambiguous destination: parent split across two branches |
256 could not solve instability, ambiguous destination: parent split across two branches |
257 |
257 |
258 $ hg evolve --all <<EOF |
258 $ hg evolve --all <<EOF |
259 > q |
259 > q |
260 > EOF |
260 > EOF |
261 ancestor 'd48a30875f01' split over multiple topological branches. |
261 ancestor of 'd48a30875f01' split over multiple topological branches. |
262 choose an evolve destination: |
262 choose an evolve destination: |
263 1: [f2632392aefe] added a b c |
263 1: [f2632392aefe] added a b c |
264 2: [7f87764e5b64] added a b c |
264 2: [7f87764e5b64] added a b c |
265 q: quit the prompt |
265 q: quit the prompt |
266 enter the index of the revision you want to select: q |
266 enter the index of the revision you want to select: q |
269 Doing the evolve with the interactive prompt |
269 Doing the evolve with the interactive prompt |
270 |
270 |
271 $ hg evolve --all <<EOF |
271 $ hg evolve --all <<EOF |
272 > 1 |
272 > 1 |
273 > EOF |
273 > EOF |
274 ancestor 'd48a30875f01' split over multiple topological branches. |
274 ancestor of 'd48a30875f01' split over multiple topological branches. |
275 choose an evolve destination: |
275 choose an evolve destination: |
276 1: [f2632392aefe] added a b c |
276 1: [f2632392aefe] added a b c |
277 2: [7f87764e5b64] added a b c |
277 2: [7f87764e5b64] added a b c |
278 q: quit the prompt |
278 q: quit the prompt |
279 enter the index of the revision you want to select: 1 |
279 enter the index of the revision you want to select: 1 |