equal
deleted
inserted
replaced
270 obs = orig.parents()[0] |
270 obs = orig.parents()[0] |
271 if not obs.obsolete(): |
271 if not obs.obsolete(): |
272 obs = orig.parents()[1] |
272 obs = orig.parents()[1] |
273 assert obs.obsolete() |
273 assert obs.obsolete() |
274 newer = obsolete.newerversion(repo, obs.node()) |
274 newer = obsolete.newerversion(repo, obs.node()) |
|
275 # search of a parent which is not killed |
|
276 while newer == [()]: |
|
277 ui.debug("stabilize target %s is plain dead," |
|
278 " trying to stabilize on it's parent") |
|
279 obs = obs.parents()[0] |
|
280 newer = obsolete.newerversion(repo, obs.node()) |
275 if len(newer) > 1: |
281 if len(newer) > 1: |
276 ui.write_err(_("conflict rewriting. can't choose destination\n")) |
282 ui.write_err(_("conflict rewriting. can't choose destination\n")) |
277 return 2 |
283 return 2 |
278 targets = newer[0] |
284 targets = newer[0] |
279 if not targets: |
285 assert targets |
280 ui.write_err(_("does not handle kill parent yet\n")) |
|
281 return 2 |
|
282 if len(targets) > 1: |
286 if len(targets) > 1: |
283 ui.write_err(_("does not handle splitted parent yet\n")) |
287 ui.write_err(_("does not handle splitted parent yet\n")) |
284 return 2 |
288 return 2 |
285 target = targets[0] |
289 target = targets[0] |
286 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate}) |
290 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate}) |