equal
deleted
inserted
replaced
1874 pctx = orig.p1() |
1874 pctx = orig.p1() |
1875 if len(orig.parents()) == 2: |
1875 if len(orig.parents()) == 2: |
1876 if not pctx.obsolete(): |
1876 if not pctx.obsolete(): |
1877 pctx = orig.p2() # second parent is obsolete ? |
1877 pctx = orig.p2() # second parent is obsolete ? |
1878 elif orig.p2().obsolete(): |
1878 elif orig.p2().obsolete(): |
1879 raise error.Abort(_("no support for evolving merge changesets " |
1879 hint = _("Redo the merge and use `hg prune <old> " |
1880 "with two obsolete parents yet"), |
1880 "--succ <new>` to obsolete the old one") |
1881 hint=_("Redo the merge and use `hg prune <old> " |
1881 ui.warn(_("warning: no support for evolving merge changesets " |
1882 "--succ <new>` to obsolete the old one")) |
1882 "with two obsolete parents yet\n") + |
|
1883 _("(%s)\n") % hint) |
|
1884 return False |
1883 |
1885 |
1884 if not pctx.obsolete(): |
1886 if not pctx.obsolete(): |
1885 ui.warn(_("cannot solve instability of %s, skipping\n") % orig) |
1887 ui.warn(_("cannot solve instability of %s, skipping\n") % orig) |
1886 return False |
1888 return False |
1887 obs = pctx |
1889 obs = pctx |