mercurial/exchange.py
changeset 33695 03039ff3082b
parent 33499 0407a51b9d8c
child 33714 2194a8723138
equal deleted inserted replaced
33694:6f4bc9688ca9 33695:03039ff3082b
   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             mst = {"unstable": _("push includes unstable changeset: %s!"),
   680             mst = {"orphan": _("push includes orphan changeset: %s!"),
   681                    "bumped": _("push includes bumped changeset: %s!"),
   681                    "bumped": _("push includes bumped changeset: %s!"),
   682                    "divergent": _("push includes divergent changeset: %s!")}
   682                    "divergent": _("push includes divergent changeset: %s!")}
   683             # If we are to push if there is at least one
   683             # If we are to push if there is at least one
   684             # obsolete or unstable changeset in missing, at
   684             # obsolete or unstable changeset in missing, at
   685             # least one of the missinghead will be obsolete or
   685             # least one of the missinghead will be obsolete or