mercurial/localrepo.py
branchstable
changeset 17855 526081552f3d
parent 17834 743d04dd48ec
child 17857 8ef4b022d562
equal deleted inserted replaced
17854:afbc7714c323 17855:526081552f3d
  1878                             # least one of the missinghead will be obsolete or
  1878                             # least one of the missinghead will be obsolete or
  1879                             # unstable. So checking heads only is ok
  1879                             # unstable. So checking heads only is ok
  1880                             for node in outgoing.missingheads:
  1880                             for node in outgoing.missingheads:
  1881                                 ctx = self[node]
  1881                                 ctx = self[node]
  1882                                 if ctx.obsolete():
  1882                                 if ctx.obsolete():
  1883                                     raise util.Abort(_(mso) % ctx)
  1883                                     raise util.Abort(mso % ctx)
  1884                                 elif ctx.unstable():
  1884                                 elif ctx.unstable():
  1885                                     raise util.Abort(_(msu) % ctx)
  1885                                     raise util.Abort(msu % ctx)
  1886                                 elif ctx.bumped():
  1886                                 elif ctx.bumped():
  1887                                     raise util.Abort(_(msb) % ctx)
  1887                                     raise util.Abort(msb % ctx)
  1888                         discovery.checkheads(self, remote, outgoing,
  1888                         discovery.checkheads(self, remote, outgoing,
  1889                                              remoteheads, newbranch,
  1889                                              remoteheads, newbranch,
  1890                                              bool(inc))
  1890                                              bool(inc))
  1891 
  1891 
  1892                     # create a changegroup from local
  1892                     # create a changegroup from local