Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 17833:0c1185f6ddd7
obsolete: simplify push abort message
to: push includes xxx changeset: yyyyyyyyyy
| author | push includes an xxx changeset: yyyyyyyyyy |
|---|---|
| date | Fri, 19 Oct 2012 00:46:39 +0200 |
| parents | 361ab1e2086f |
| children | 743d04dd48ec |
comparison
equal
deleted
inserted
replaced
| 17832:82f1fe0308bd | 17833:0c1185f6ddd7 |
|---|---|
| 1868 if not force: | 1868 if not force: |
| 1869 # if self.obsstore == False --> no obsolete | 1869 # if self.obsstore == False --> no obsolete |
| 1870 # then, save the iteration | 1870 # then, save the iteration |
| 1871 if self.obsstore: | 1871 if self.obsstore: |
| 1872 # this message are here for 80 char limit reason | 1872 # this message are here for 80 char limit reason |
| 1873 mso = _("push includes an obsolete changeset: %s!") | 1873 mso = _("push includes obsolete changeset: %s!") |
| 1874 msu = _("push includes an unstable changeset: %s!") | 1874 msu = _("push includes unstable changeset: %s!") |
| 1875 # If we are to push if there is at least one | 1875 # If we are to push if there is at least one |
| 1876 # obsolete or unstable changeset in missing, at | 1876 # obsolete or unstable changeset in missing, at |
| 1877 # least one of the missinghead will be obsolete or | 1877 # least one of the missinghead will be obsolete or |
| 1878 # unstable. So checking heads only is ok | 1878 # unstable. So checking heads only is ok |
| 1879 for node in outgoing.missingheads: | 1879 for node in outgoing.missingheads: |