Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 6181:d500aeb8092e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warning on push should mention heads, not branches This makes the concept easier to relate to similar messages given on pull, and allows for a distinction between heads and (named) branches.
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 28 Feb 2008 17:51:04 +0100
parents 23ffe82615d8
children 305d4450036a
comparison
equal deleted inserted replaced
6180:d98ef03893e6 6181:d500aeb8092e
1525 newheads.append(r) 1525 newheads.append(r)
1526 if len(newheads) > len(remote_heads): 1526 if len(newheads) > len(remote_heads):
1527 warn = 1 1527 warn = 1
1528 1528
1529 if warn: 1529 if warn:
1530 self.ui.warn(_("abort: push creates new remote branches!\n")) 1530 self.ui.warn(_("abort: push creates new remote heads!\n"))
1531 self.ui.status(_("(did you forget to merge?" 1531 self.ui.status(_("(did you forget to merge?"
1532 " use push -f to force)\n")) 1532 " use push -f to force)\n"))
1533 return None, 0 1533 return None, 0
1534 elif inc: 1534 elif inc:
1535 self.ui.warn(_("note: unsynced remote changes!\n")) 1535 self.ui.warn(_("note: unsynced remote changes!\n"))