Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 6130:516d8ffede7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sat, 16 Feb 2008 12:46:28 +0100
parents 7336aeff1a1d 65340b8231eb
children 989467e8e3a9
comparison
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: