675 # if repo.obsstore == False --> no obsolete |
675 # if repo.obsstore == False --> no obsolete |
676 # then, save the iteration |
676 # then, save the iteration |
677 if unfi.obsstore: |
677 if unfi.obsstore: |
678 # this message are here for 80 char limit reason |
678 # this message are here for 80 char limit reason |
679 mso = _("push includes obsolete changeset: %s!") |
679 mso = _("push includes obsolete changeset: %s!") |
|
680 mscd = _("push includes content-divergent changeset: %s!") |
680 mst = {"orphan": _("push includes orphan changeset: %s!"), |
681 mst = {"orphan": _("push includes orphan changeset: %s!"), |
681 "bumped": _("push includes bumped changeset: %s!"), |
682 "bumped": _("push includes bumped changeset: %s!"), |
682 "divergent": _("push includes divergent changeset: %s!")} |
683 "content-divergent": mscd} |
683 # If we are to push if there is at least one |
684 # If we are to push if there is at least one |
684 # obsolete or unstable changeset in missing, at |
685 # obsolete or unstable changeset in missing, at |
685 # least one of the missinghead will be obsolete or |
686 # least one of the missinghead will be obsolete or |
686 # unstable. So checking heads only is ok |
687 # unstable. So checking heads only is ok |
687 for node in outgoing.missingheads: |
688 for node in outgoing.missingheads: |