equal
deleted
inserted
replaced
777 rebase = extensions.find('rebase') |
777 rebase = extensions.find('rebase') |
778 # dummy state to trick rebase node |
778 # dummy state to trick rebase node |
779 if not orig.p2().rev() == node.nullrev: |
779 if not orig.p2().rev() == node.nullrev: |
780 raise util.Abort( |
780 raise util.Abort( |
781 'no support for evolving merge changesets yet', |
781 'no support for evolving merge changesets yet', |
782 hint="Redo the merge and use `hg prune` to obsolete the old one") |
782 hint="Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one") |
783 destbookmarks = repo.nodebookmarks(dest.node()) |
783 destbookmarks = repo.nodebookmarks(dest.node()) |
784 nodesrc = orig.node() |
784 nodesrc = orig.node() |
785 destphase = repo[nodesrc].phase() |
785 destphase = repo[nodesrc].phase() |
786 commitmsg = orig.description() |
786 commitmsg = orig.description() |
787 |
787 |