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 hint = _("Redo the merge and use `hg prune <old> " |
1879 hint = _("Redo the merge (%s) and use `hg prune <old> " |
1880 "--succ <new>` to obsolete the old one") |
1880 "--succ <new>` to obsolete the old one") % orig.hex()[:12] |
1881 ui.warn(_("warning: no support for evolving merge changesets " |
1881 ui.warn(_("warning: no support for evolving merge changesets " |
1882 "with two obsolete parents yet\n") + |
1882 "with two obsolete parents yet\n") + |
1883 _("(%s)\n") % hint) |
1883 _("(%s)\n") % hint) |
1884 return False |
1884 return False |
1885 |
1885 |