equal
deleted
inserted
replaced
110 could not solve instability, ambiguous destination: parent split across two branches |
110 could not solve instability, ambiguous destination: parent split across two 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 > 0 |
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 '7235ef625ea3' split over multiple topological branches. |
120 ancestor '7235ef625ea3' split over multiple topological branches. |
121 choose an evolve destination: |
121 choose an evolve destination: |
122 0: [62fb70414f99] added c |
122 1: [62fb70414f99] added c |
123 1: [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: 0 |
125 enter the index of the revision you want to select: 1 |
126 move:[9] merge commit |
126 move:[9] merge commit |
127 atop:[6] added c |
127 atop:[6] added c |
128 working directory is now at 28a0775ac832 |
128 working directory is now at 28a0775ac832 |
129 |
129 |
130 $ hg glog |
130 $ hg glog |
251 atop:[6] added a |
251 atop:[6] added a |
252 hg rebase -r a1da0651488c -d 5568b87b1491 |
252 hg rebase -r a1da0651488c -d 5568b87b1491 |
253 could not solve instability, ambiguous destination: parent split across two branches |
253 could not solve instability, ambiguous destination: parent split across two branches |
254 |
254 |
255 $ hg evolve --any --all --config ui.interactive=True <<EOF |
255 $ hg evolve --any --all --config ui.interactive=True <<EOF |
256 > 1 |
256 > 2 |
257 > EOF |
257 > EOF |
258 move:[2] added b |
258 move:[2] added b |
259 atop:[6] added a |
259 atop:[6] added a |
260 move:[4] merge commit |
260 move:[4] merge commit |
261 ancestor 'cdf2ea1b9312' split over multiple topological branches. |
261 ancestor 'cdf2ea1b9312' split over multiple topological branches. |
262 choose an evolve destination: |
262 choose an evolve destination: |
263 0: [62fb70414f99] added c |
263 1: [62fb70414f99] added c |
264 1: [5841d7cf9893] added d |
264 2: [5841d7cf9893] added d |
265 q: quit the prompt |
265 q: quit the prompt |
266 enter the index of the revision you want to select: 1 |
266 enter the index of the revision you want to select: 2 |
267 move:[10] merge commit |
267 move:[10] merge commit |
268 atop:[8] added d |
268 atop:[8] added d |
269 working directory is now at 460e6e72b7f9 |
269 working directory is now at 460e6e72b7f9 |
270 |
270 |
271 $ hg glog |
271 $ hg glog |
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: parent split across two branches |
399 |
399 |
400 $ hg evolve --any --all --config ui.interactive=True <<EOF |
400 $ hg evolve --any --all --config ui.interactive=True <<EOF |
401 > 1 |
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 'b9b387427a53' split over multiple topological branches. |
405 ancestor 'b9b387427a53' split over multiple topological branches. |
406 choose an evolve destination: |
406 choose an evolve destination: |
407 0: [62fb70414f99] added c |
407 1: [62fb70414f99] added c |
408 1: [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: 1 |
410 enter the index of the revision you want to select: 2 |
411 move:[4] merge commit |
411 move:[4] merge commit |
412 atop:[8] added d |
412 atop:[8] added d |
413 move:[10] merge commit |
413 move:[10] merge commit |
414 atop:[9] added b |
414 atop:[9] added b |
415 working directory is now at 578c938ebd2e |
415 working directory is now at 578c938ebd2e |