mercurial/localrepo.py
changeset 6130 516d8ffede7c
parent 6121 7336aeff1a1d
parent 6098 65340b8231eb
child 6139 989467e8e3a9
equal deleted inserted replaced
6129:3d666e8e6398 6130:516d8ffede7c
  1520 
  1520 
  1521             if warn:
  1521             if warn:
  1522                 self.ui.warn(_("abort: push creates new remote branches!\n"))
  1522                 self.ui.warn(_("abort: push creates new remote branches!\n"))
  1523                 self.ui.status(_("(did you forget to merge?"
  1523                 self.ui.status(_("(did you forget to merge?"
  1524                                  " use push -f to force)\n"))
  1524                                  " use push -f to force)\n"))
  1525                 return None, 1
  1525                 return None, 0
  1526             elif inc:
  1526             elif inc:
  1527                 self.ui.warn(_("note: unsynced remote changes!\n"))
  1527                 self.ui.warn(_("note: unsynced remote changes!\n"))
  1528 
  1528 
  1529 
  1529 
  1530         if revs is None:
  1530         if revs is None: