50 |
50 |
51 $ hg up 1b24879c5c3c |
51 $ hg up 1b24879c5c3c |
52 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
52 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
53 $ echo foo > a |
53 $ echo foo > a |
54 $ hg amend |
54 $ hg amend |
55 2 new orphan changesets |
55 2 new unstable changesets |
56 |
56 |
57 $ hg up bde1d2b6b5e5 |
57 $ hg up bde1d2b6b5e5 |
58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
59 $ echo c > c |
59 $ echo c > c |
60 $ hg ci -Aqm "added c" |
60 $ hg ci -Aqm "added c" |
61 $ hg up .^ |
61 $ hg up .^ |
62 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
62 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
63 $ echo d > d |
63 $ echo d > d |
64 $ hg ci -Aqm "added d" |
64 $ hg ci -Aqm "added d" |
65 $ hg glog |
65 $ hg glog |
66 @ 7:5841d7cf9893 added d |
66 @ 8:5841d7cf9893 added d |
67 | () draft |
67 | () draft |
68 | o 6:62fb70414f99 added c |
68 | o 7:62fb70414f99 added c |
69 |/ () draft |
69 |/ () draft |
70 | o 5:7014ec2829cd added a |
70 | o 6:7014ec2829cd added a |
71 |/ () draft |
71 |/ () draft |
72 | o 4:b9b387427a53 merge commit |
72 | o 4:b9b387427a53 merge commit |
73 | |\ () draft |
73 | |\ () draft |
74 +---o 3:9402371b436e added c and d |
74 +---o 3:9402371b436e added c and d |
75 | | () draft |
75 | | () draft |
82 |
82 |
83 $ hg prune -r 9402371b436e --succ 62fb70414f99 --succ 5841d7cf9893 --split |
83 $ hg prune -r 9402371b436e --succ 62fb70414f99 --succ 5841d7cf9893 --split |
84 1 changesets pruned |
84 1 changesets pruned |
85 |
85 |
86 $ hg glog |
86 $ hg glog |
87 @ 7:5841d7cf9893 added d |
87 @ 8:5841d7cf9893 added d |
88 | () draft |
88 | () draft |
89 | o 6:62fb70414f99 added c |
89 | o 7:62fb70414f99 added c |
90 |/ () draft |
90 |/ () draft |
91 | o 5:7014ec2829cd added a |
91 | o 6:7014ec2829cd added a |
92 |/ () draft |
92 |/ () draft |
93 | o 4:b9b387427a53 merge commit |
93 | o 4:b9b387427a53 merge commit |
94 | |\ () draft |
94 | |\ () draft |
95 +---x 3:9402371b436e added c and d |
95 +---x 3:9402371b436e added c and d |
96 | | () draft |
96 | | () draft |
103 |
103 |
104 Checking what evolve is trying to do |
104 Checking what evolve is trying to do |
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:[6] 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: 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 > 0 |
116 > EOF |
116 > EOF |
117 move:[2] added b |
117 move:[2] added b |
118 atop:[5] added a |
118 atop:[6] 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 0: [62fb70414f99] added c |
123 1: [5841d7cf9893] added d |
123 1: [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: 0 |
126 move:[9] merge commit |
126 move:[10] merge commit |
127 atop:[6] added c |
127 atop:[7] added c |
128 working directory is now at 28a0775ac832 |
128 working directory is now at 28a0775ac832 |
129 |
129 |
130 $ hg glog |
130 $ hg glog |
131 @ 10:28a0775ac832 merge commit |
131 @ 11:28a0775ac832 merge commit |
132 |\ () draft |
132 |\ () draft |
133 | o 8:2baf8bae7ea4 added b |
133 | o 9:2baf8bae7ea4 added b |
134 | | () draft |
134 | | () draft |
135 | | o 7:5841d7cf9893 added d |
135 | | o 8:5841d7cf9893 added d |
136 | | | () draft |
136 | | | () draft |
137 o---+ 6:62fb70414f99 added c |
137 o---+ 7:62fb70414f99 added c |
138 / / () draft |
138 / / () draft |
139 o / 5:7014ec2829cd added a |
139 o / 6:7014ec2829cd added a |
140 |/ () draft |
140 |/ () draft |
141 o 0:bde1d2b6b5e5 added base |
141 o 0:bde1d2b6b5e5 added base |
142 () draft |
142 () draft |
143 |
143 |
144 $ cd .. |
144 $ cd .. |