equal
deleted
inserted
replaced
105 |
105 |
106 $ hg evolve --dry-run --any --all |
106 $ hg evolve --dry-run --any --all |
107 move:[2] added b |
107 move:[2] added b |
108 atop:[5] added a |
108 atop:[5] added a |
109 hg rebase -r a1da0651488c -d 7014ec2829cd |
109 hg rebase -r a1da0651488c -d 7014ec2829cd |
110 could not solve instability, ambiguous destination: parent split across two branches |
110 could not solve instability, ambiguous destination: ancestors split across different branches |
111 |
111 |
112 Resolving instability using `hg evolve` |
112 Resolving instability using `hg evolve` |
113 |
113 |
114 $ hg evolve --any --all --config ui.interactive=True <<EOF |
114 $ hg evolve --any --all --config ui.interactive=True <<EOF |
115 > 1 |
115 > 1 |
116 > EOF |
116 > EOF |
117 move:[2] added b |
117 move:[2] added b |
118 atop:[5] added a |
118 atop:[5] added a |
119 move:[4] merge commit |
119 move:[4] merge commit |
120 ancestor of '7235ef625ea3' split over multiple topological branches. |
120 successors of ancestors of 7235ef625ea3 are on different topological branches |
121 choose an evolve destination: |
121 choose an evolve destination: |
122 1: [62fb70414f99] added c |
122 1: [62fb70414f99] added c |
123 2: [5841d7cf9893] added d |
123 2: [5841d7cf9893] added d |
124 q: quit the prompt |
124 q: quit the prompt |
125 enter the index of the revision you want to select: 1 |
125 enter the index of the revision you want to select: 1 |
247 |
247 |
248 $ hg evolve --any --all --dry-run |
248 $ hg evolve --any --all --dry-run |
249 move:[2] added b |
249 move:[2] added b |
250 atop:[6] added a |
250 atop:[6] added a |
251 hg rebase -r a1da0651488c -d 5568b87b1491 |
251 hg rebase -r a1da0651488c -d 5568b87b1491 |
252 could not solve instability, ambiguous destination: parent split across two branches |
252 could not solve instability, ambiguous destination: ancestors split across different branches |
253 |
253 |
254 $ hg evolve --any --all --config ui.interactive=True <<EOF |
254 $ hg evolve --any --all --config ui.interactive=True <<EOF |
255 > 2 |
255 > 2 |
256 > EOF |
256 > EOF |
257 move:[2] added b |
257 move:[2] added b |
258 atop:[6] added a |
258 atop:[6] added a |
259 move:[4] merge commit |
259 move:[4] merge commit |
260 ancestor of 'cdf2ea1b9312' split over multiple topological branches. |
260 successors of ancestors of cdf2ea1b9312 are on different topological branches |
261 choose an evolve destination: |
261 choose an evolve destination: |
262 1: [62fb70414f99] added c |
262 1: [62fb70414f99] added c |
263 2: [5841d7cf9893] added d |
263 2: [5841d7cf9893] added d |
264 q: quit the prompt |
264 q: quit the prompt |
265 enter the index of the revision you want to select: 2 |
265 enter the index of the revision you want to select: 2 |
393 |
393 |
394 $ hg evolve --any --all --dry-run |
394 $ hg evolve --any --all --dry-run |
395 move:[2] added b |
395 move:[2] added b |
396 atop:[6] added a |
396 atop:[6] added a |
397 hg rebase -r a1da0651488c -d 5568b87b1491 |
397 hg rebase -r a1da0651488c -d 5568b87b1491 |
398 could not solve instability, ambiguous destination: parent split across two branches |
398 could not solve instability, ambiguous destination: ancestors split across different branches |
399 |
399 |
400 $ hg evolve --any --all --config ui.interactive=True <<EOF |
400 $ hg evolve --any --all --config ui.interactive=True <<EOF |
401 > 2 |
401 > 2 |
402 > EOF |
402 > EOF |
403 move:[2] added b |
403 move:[2] added b |
404 atop:[6] added a |
404 atop:[6] added a |
405 ancestor of 'b9b387427a53' split over multiple topological branches. |
405 successors of ancestors of b9b387427a53 are on different topological branches |
406 choose an evolve destination: |
406 choose an evolve destination: |
407 1: [62fb70414f99] added c |
407 1: [62fb70414f99] added c |
408 2: [5841d7cf9893] added d |
408 2: [5841d7cf9893] added d |
409 q: quit the prompt |
409 q: quit the prompt |
410 enter the index of the revision you want to select: 2 |
410 enter the index of the revision you want to select: 2 |