38 move:[2] changea |
38 move:[2] changea |
39 atop:[3] changea |
39 atop:[3] changea |
40 perform evolve? [Ny] y |
40 perform evolve? [Ny] y |
41 hg rebase -r cce2c55b8965 -d fb9d051ec0a4 |
41 hg rebase -r cce2c55b8965 -d fb9d051ec0a4 |
42 resolving manifests |
42 resolving manifests |
|
43 evolution of 2:cce2c55b8965 created no changes to commit |
|
44 |
43 $ glog --hidden |
45 $ glog --hidden |
44 @ 3:fb9d051ec0a4@default(draft) bk:[changea] changea |
46 @ 3:fb9d051ec0a4@default(draft) bk:[changea] changea |
45 | |
47 | |
46 | x 2:cce2c55b8965@default(draft) bk:[] changea |
48 | x 2:cce2c55b8965@default(draft) bk:[] changea |
47 | | |
49 | | |
78 move:[4] newer a |
80 move:[4] newer a |
79 atop:[5] changea |
81 atop:[5] changea |
80 merging a |
82 merging a |
81 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
83 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
82 evolve failed! |
84 evolve failed! |
83 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
85 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
84 abort: unresolved merge conflicts (see hg help resolve) |
86 abort: unresolved merge conflicts (see hg help resolve) |
85 [255] |
87 [255] |
86 $ hg revert -r "orphan()" a |
88 $ hg revert -r "orphan()" a |
87 $ hg diff |
89 $ hg diff |
88 diff -r 66719795a494 a |
90 diff -r 66719795a494 a |
171 recreate:[9] newer a |
173 recreate:[9] newer a |
172 atop:[6] newer a |
174 atop:[6] newer a |
173 perform evolve? [Ny] y |
175 perform evolve? [Ny] y |
174 rebasing to destination parent: 66719795a494 |
176 rebasing to destination parent: 66719795a494 |
175 computing new diff |
177 computing new diff |
176 committed as 3d968e0b3097 |
178 committed as 8fc63fe1f297 |
177 working directory is now at 3d968e0b3097 |
179 working directory is now at 8fc63fe1f297 |
178 $ glog |
180 $ glog |
179 @ 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
181 @ 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
180 | |
182 | |
181 | o 7:7bc2f5967f5e@default(draft) bk:[] add c |
183 | o 7:7bc2f5967f5e@default(draft) bk:[] add c |
182 | | |
184 | | |
183 o | 6:1cf0aacfd363@default(public) bk:[] newer a |
185 o | 6:1cf0aacfd363@default(public) bk:[] newer a |
184 |/ |
186 |/ |
185 o 5:66719795a494@default(public) bk:[changea] changea |
187 o 5:66719795a494@default(public) bk:[changea] changea |
186 | |
188 | |
187 o 0:07f494440405@default(public) bk:[] adda |
189 o 0:07f494440405@default(public) bk:[] adda |
188 |
190 |
|
191 $ hg exp |
|
192 # HG changeset patch |
|
193 # User test |
|
194 # Date 0 0 |
|
195 # Thu Jan 01 00:00:00 1970 +0000 |
|
196 # Node ID 8fc63fe1f297f356d1156bbbbe865b9911efad74 |
|
197 # Parent 1cf0aacfd36310b18e403e1594871187e0364a82 |
|
198 phase-divergent update to 1cf0aacfd363: |
|
199 |
|
200 newer a |
|
201 |
|
202 diff -r 1cf0aacfd363 -r 8fc63fe1f297 a |
|
203 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
204 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
205 @@ -1,3 +1,4 @@ |
|
206 a |
|
207 a |
|
208 newer a |
|
209 +babar |
189 |
210 |
190 Stabilize divergent changesets with same parent |
211 Stabilize divergent changesets with same parent |
191 =============================================== |
212 =============================================== |
192 |
213 |
193 $ rm a.orig |
214 $ rm a.orig |
194 $ hg up 7bc2f5967f5e |
215 $ hg up 7bc2f5967f5e |
195 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
216 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
196 $ cat << EOF >> a |
217 $ cat << EOF >> a |
197 > flore |
218 > flore |
198 > arthur |
219 > arthur |
199 > zephir |
220 > zephir |
200 > some |
221 > some |
203 > EOF |
224 > EOF |
204 $ hg ci -m 'More addition' |
225 $ hg ci -m 'More addition' |
205 $ glog |
226 $ glog |
206 @ 12:3932c176bbaa@default(draft) bk:[] More addition |
227 @ 12:3932c176bbaa@default(draft) bk:[] More addition |
207 | |
228 | |
208 | o 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
229 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
209 | | |
230 | | |
210 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
231 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
211 | | |
232 | | |
212 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
233 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
213 |/ |
234 |/ |
232 $ glog |
253 $ glog |
233 @ 14:eacc9c8240fe@default(draft) bk:[] More addition |
254 @ 14:eacc9c8240fe@default(draft) bk:[] More addition |
234 | |
255 | |
235 | * 13:d2f173e25686@default(draft) bk:[] More addition |
256 | * 13:d2f173e25686@default(draft) bk:[] More addition |
236 |/ |
257 |/ |
237 | o 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
258 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
238 | | |
259 | | |
239 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
260 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
240 | | |
261 | | |
241 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
262 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
242 |/ |
263 |/ |
282 working directory is now at f344982e63c4 |
303 working directory is now at f344982e63c4 |
283 $ hg st |
304 $ hg st |
284 $ glog |
305 $ glog |
285 @ 15:f344982e63c4@default(draft) bk:[] More addition |
306 @ 15:f344982e63c4@default(draft) bk:[] More addition |
286 | |
307 | |
287 | o 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
308 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
288 | | |
309 | | |
289 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
310 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
290 | | |
311 | | |
291 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
312 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
292 |/ |
313 |/ |