Mercurial > evolve

comparison tests/test-unstability-resolution-result.t @ 6395:1328195f76a9 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 06 Feb 2023 19:49:33 +0400
parents c0921b5277a0 53d63b608230
children
comparison
equal deleted inserted replaced
6349:3b486ae2e79a 6395:1328195f76a9
106 $ hg resolve -m a 106 $ hg resolve -m a
107 (no more unresolved files) 107 (no more unresolved files)
108 continue: hg evolve --continue 108 continue: hg evolve --continue
109 $ hg evolve --continue 109 $ hg evolve --continue
110 evolving 4:3655f0f50885 "newer a" 110 evolving 4:3655f0f50885 "newer a"
111 working directory is now at 1cf0aacfd363 111 working directory is now at 99ec7503cf5a
112 112
113 Stabilize phase-divergent changesets with a different parent 113 Stabilize phase-divergent changesets with a different parent
114 ============================================================ 114 ============================================================
115 115
116 (the same-parent case is handled in test-evolve.t) 116 (the same-parent case is handled in test-evolve.t)
117 117
118 $ glog 118 $ glog
119 @ 6:1cf0aacfd363@default(draft) bk:[] newer a 119 @ 6:99ec7503cf5a@default(draft) bk:[] newer a
120 | 120 |
121 o 5:66719795a494@default(draft) bk:[changea] changea 121 o 5:66719795a494@default(draft) bk:[changea] changea
122 | 122 |
123 o 0:07f494440405@default(draft) bk:[] adda 123 o 0:07f494440405@default(draft) bk:[] adda
124 124
134 $ hg commit -m 'add c' 134 $ hg commit -m 'add c'
135 created new head 135 created new head
136 136
137 Get a successors of 8 on it 137 Get a successors of 8 on it
138 138
139 $ hg pick 1cf0aacfd363 139 $ hg pick 99ec7503cf5a
140 picking 6:1cf0aacfd363 "newer a" 140 picking 6:99ec7503cf5a "newer a"
141 141
142 Add real change to the successors 142 Add real change to the successors
143 143
144 $ echo 'babar' >> a 144 $ echo 'babar' >> a
145 $ hg amend 145 $ hg amend
146 146
147 Make precursors public 147 Make precursors public
148 148
149 $ hg phase --hidden --public 1cf0aacfd363 149 $ hg phase --hidden --public 99ec7503cf5a
150 1 new phase-divergent changesets 150 1 new phase-divergent changesets
151 $ glog 151 $ glog
152 @ 9:99c21c89bcef@default(draft) bk:[] newer a 152 @ 9:998db519ac88@default(draft) bk:[] newer a
153 | 153 |
154 o 7:7bc2f5967f5e@default(draft) bk:[] add c 154 o 7:7bc2f5967f5e@default(draft) bk:[] add c
155 | 155 |
156 | o 6:1cf0aacfd363@default(public) bk:[] newer a 156 | o 6:99ec7503cf5a@default(public) bk:[] newer a
157 |/ 157 |/
158 o 5:66719795a494@default(public) bk:[changea] changea 158 o 5:66719795a494@default(public) bk:[changea] changea
159 | 159 |
160 o 0:07f494440405@default(public) bk:[] adda 160 o 0:07f494440405@default(public) bk:[] adda
161 161
163 Stabilize! 163 Stabilize!
164 164
165 $ hg evolve --any --dry-run --phase-divergent 165 $ hg evolve --any --dry-run --phase-divergent
166 recreate:[9] newer a 166 recreate:[9] newer a
167 atop:[6] newer a 167 atop:[6] newer a
168 hg rebase --rev 99c21c89bcef --dest 66719795a494; 168 hg rebase --rev 998db519ac88 --dest 66719795a494;
169 hg update 1cf0aacfd363; 169 hg update 99ec7503cf5a;
170 hg revert --all --rev 99c21c89bcef; 170 hg revert --all --rev 998db519ac88;
171 hg commit --message "phase-divergent update to 99c21c89bcef" 171 hg commit --message "phase-divergent update to 998db519ac88"
172 $ hg evolve --any --confirm --phase-divergent 172 $ hg evolve --any --confirm --phase-divergent
173 recreate:[9] newer a 173 recreate:[9] newer a
174 atop:[6] newer a 174 atop:[6] newer a
175 perform evolve? [Ny] n 175 perform evolve? [Ny] n
176 abort: evolve aborted by user 176 abort: evolve aborted by user
178 $ echo y | hg evolve --any --confirm --config ui.interactive=True --phase-divergent 178 $ echo y | hg evolve --any --confirm --config ui.interactive=True --phase-divergent
179 recreate:[9] newer a 179 recreate:[9] newer a
180 atop:[6] newer a 180 atop:[6] newer a
181 perform evolve? [Ny] y 181 perform evolve? [Ny] y
182 rebasing to destination parent: 66719795a494 182 rebasing to destination parent: 66719795a494
183 committed as 8fc63fe1f297 183 committed as 1e688a4b6db8
184 working directory is now at 8fc63fe1f297 184 working directory is now at 1e688a4b6db8
185 $ glog 185 $ glog
186 @ 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: 186 @ 11:1e688a4b6db8@default(draft) bk:[] phase-divergent update to 99ec7503cf5a:
187 | 187 |
188 | o 7:7bc2f5967f5e@default(draft) bk:[] add c 188 | o 7:7bc2f5967f5e@default(draft) bk:[] add c
189 | | 189 | |
190 o | 6:1cf0aacfd363@default(public) bk:[] newer a 190 o | 6:99ec7503cf5a@default(public) bk:[] newer a
191 |/ 191 |/
192 o 5:66719795a494@default(public) bk:[changea] changea 192 o 5:66719795a494@default(public) bk:[changea] changea
193 | 193 |
194 o 0:07f494440405@default(public) bk:[] adda 194 o 0:07f494440405@default(public) bk:[] adda
195 195
196 $ hg exp 196 $ hg exp
197 # HG changeset patch 197 # HG changeset patch
198 # User test 198 # User test
199 # Date 0 0 199 # Date 0 0
200 # Thu Jan 01 00:00:00 1970 +0000 200 # Thu Jan 01 00:00:00 1970 +0000
201 # Node ID 8fc63fe1f297f356d1156bbbbe865b9911efad74 201 # Node ID 1e688a4b6db81db9b647e9045aff0fcbc5c32b8d
202 # Parent 1cf0aacfd36310b18e403e1594871187e0364a82 202 # Parent 99ec7503cf5a2cd545f41792129becc4172e9e9d
203 phase-divergent update to 1cf0aacfd363: 203 phase-divergent update to 99ec7503cf5a:
204 204
205 newer a 205 newer a
206 206
207 diff -r 1cf0aacfd363 -r 8fc63fe1f297 a 207 diff -r 99ec7503cf5a -r 1e688a4b6db8 a
208 --- a/a Thu Jan 01 00:00:00 1970 +0000 208 --- a/a Thu Jan 01 00:00:00 1970 +0000
209 +++ b/a Thu Jan 01 00:00:00 1970 +0000 209 +++ b/a Thu Jan 01 00:00:00 1970 +0000
210 @@ -1,3 +1,4 @@ 210 @@ -1,3 +1,4 @@
211 a 211 a
212 a 212 a