97 grafting revision 5 |
97 grafting revision 5 |
98 |
98 |
99 Stabilize of late comer with different parent |
99 Stabilize of late comer with different parent |
100 ================================================== |
100 ================================================== |
101 |
101 |
102 (the with same parent is handled in test-evolve.t) |
102 (the same parent case is handled in test-evolve.t) |
103 |
103 |
104 $ glog |
104 $ glog |
105 @ 8:e3183e9c0961@default(draft) bk:[] newer a |
105 @ 8:e3183e9c0961@default(draft) bk:[] newer a |
106 | |
106 | |
107 o 7:e8cc1b534401@default(draft) bk:[changea] changea |
107 o 7:e8cc1b534401@default(draft) bk:[changea] changea |
147 Stabilize ! |
147 Stabilize ! |
148 |
148 |
149 $ hg evolve --any --dry-run |
149 $ hg evolve --any --dry-run |
150 recreate:[12] newer a |
150 recreate:[12] newer a |
151 atop:[8] newer a |
151 atop:[8] newer a |
152 hg rebase --rev 15c83af6f3a3 --detach e8cc1b534401; |
152 hg rebase --rev 15c83af6f3a3 --dest e8cc1b534401; |
153 hg update e3183e9c0961; |
153 hg update e3183e9c0961; |
154 hg revert --all --rev 15c83af6f3a3; |
154 hg revert --all --rev 15c83af6f3a3; |
155 hg commit --msg "latecomer update to %s" (no-eol) |
155 hg commit --msg "latecomer update to %s" (no-eol) |
156 $ hg evolve --any |
156 $ hg evolve --any |
157 recreate:[12] newer a |
157 recreate:[12] newer a |
169 o 7:e8cc1b534401@default(public) bk:[changea] changea |
169 o 7:e8cc1b534401@default(public) bk:[changea] changea |
170 | |
170 | |
171 o 0:07f494440405@default(public) bk:[] adda |
171 o 0:07f494440405@default(public) bk:[] adda |
172 |
172 |
173 |
173 |
174 Stabilize of conflicting changeset with same parent |
174 Stabilize conflicting changesets with same parent |
175 ==================================================== |
175 ================================================= |
176 |
176 |
177 $ rm a.orig |
177 $ rm a.orig |
178 $ hg up 9 |
178 $ hg up 9 |
179 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
179 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
180 $ cat << EOF >> a |
180 $ cat << EOF >> a |
229 |
229 |
230 Stabilize It |
230 Stabilize It |
231 |
231 |
232 $ hg evolve -qn |
232 $ hg evolve -qn |
233 hg update -c 3883461cc228 && |
233 hg update -c 3883461cc228 && |
234 hg merge 4754d61bc2db && |
234 hg merge 4754d61bc2db && |
235 hg commit -m "auto merge resolving conflict between 3883461cc228 and 4754d61bc2db"&& |
235 hg commit -m "auto merge resolving conflict between 3883461cc228 and 4754d61bc2db"&& |
236 hg up -C 7391601a4bfa && |
236 hg up -C 7391601a4bfa && |
237 hg revert --all --rev tip && |
237 hg revert --all --rev tip && |
238 hg commit -m "`hg log -r 3883461cc228 --template={desc}`"; |
238 hg commit -m "`hg log -r 3883461cc228 --template={desc}`"; |
239 $ hg evolve -v |
239 $ hg evolve -v |
286 +zephir |
286 +zephir |
287 +some |
287 +some |
288 +less |
288 +less |
289 +conflict |
289 +conflict |
290 +babar |
290 +babar |
|
291 |
|
292 Check conflicting during conflicting resolution |
|
293 ------------------------------------------------- |
|
294 |
|
295 $ hg up 15 |
|
296 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
297 Working directory parent is obsolete |
|
298 $ echo 'gotta break' >> a |
|
299 $ hg amend |
|
300 1 new conflicting changesets |
|
301 $ hg evolve -qn |
|
302 hg update -c c956a4b140b6 && |
|
303 hg merge ac6d600735a4 && |
|
304 hg commit -m "auto merge resolving conflict between c956a4b140b6 and ac6d600735a4"&& |
|
305 hg up -C 7391601a4bfa && |
|
306 hg revert --all --rev tip && |
|
307 hg commit -m "`hg log -r c956a4b140b6 --template={desc}`"; |
|
308 $ hg evolve |
|
309 merge:[24] More addition |
|
310 with: [22] More addition |
|
311 base: [15] More addition |
|
312 merging a |
|
313 warning: conflicts during merge. |
|
314 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
315 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
316 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
317 abort: Merge conflict between several amendments, and this is not yet automated |
|
318 (/!\ You can try: |
|
319 /!\ * manual merge + resolve => new cset X |
|
320 /!\ * hg up to the parent of the amended changeset (which are named W and Z) |
|
321 /!\ * hg revert --all -r X |
|
322 /!\ * hg ci -m "same message as the amended changeset" => new cset Y |
|
323 /!\ * hg kill -n Y W Z |
|
324 ) |
|
325 [255] |