Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/localrepo.py @ 6098:65340b8231eb
push: exit(1) if "push creates new remote branches!"
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 15 Feb 2008 15:44:32 -0200 |
parents | ee317dbfb9d0 |
children | 516d8ffede7c |
comparison
equal
deleted
inserted
replaced
6089:28054773438c | 6098:65340b8231eb |
---|---|
1431 | 1431 |
1432 if warn: | 1432 if warn: |
1433 self.ui.warn(_("abort: push creates new remote branches!\n")) | 1433 self.ui.warn(_("abort: push creates new remote branches!\n")) |
1434 self.ui.status(_("(did you forget to merge?" | 1434 self.ui.status(_("(did you forget to merge?" |
1435 " use push -f to force)\n")) | 1435 " use push -f to force)\n")) |
1436 return None, 1 | 1436 return None, 0 |
1437 elif inc: | 1437 elif inc: |
1438 self.ui.warn(_("note: unsynced remote changes!\n")) | 1438 self.ui.warn(_("note: unsynced remote changes!\n")) |
1439 | 1439 |
1440 | 1440 |
1441 if revs is None: | 1441 if revs is None: |