Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/localrepo.py @ 2793:2d60c682a081
localrepo.update: allow to suppress commit reminder.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Mon, 07 Aug 2006 17:22:17 -0700 |
parents | e3564699409c |
children | 987c31e2a08c |
line wrap: on
line diff
--- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -1698,7 +1698,8 @@ class localrepository(repo.repository): return newheads - oldheads + 1 def update(self, node, allow=False, force=False, choose=None, - moddirstate=True, forcemerge=False, wlock=None, show_stats=True): + moddirstate=True, forcemerge=False, wlock=None, + show_stats=True, remind=True): pl = self.dirstate.parents() if not force and pl[1] != nullid: raise util.Abort(_("outstanding uncommitted merges")) @@ -1987,8 +1988,9 @@ class localrepository(repo.repository): " hg merge %s\n" % (self.changelog.rev(p1), self.changelog.rev(p2)))) - else: - self.ui.status(_("(branch merge, don't forget to commit)\n")) + elif remind: + self.ui.status(_("(branch merge, don't forget " + "to commit)\n")) elif failedmerge: self.ui.status(_("There are unresolved merges with" " locally modified files.\n"))