equal
deleted
inserted
replaced
1696 source=srctype, url=url) |
1696 source=srctype, url=url) |
1697 |
1697 |
1698 return newheads - oldheads + 1 |
1698 return newheads - oldheads + 1 |
1699 |
1699 |
1700 def update(self, node, allow=False, force=False, choose=None, |
1700 def update(self, node, allow=False, force=False, choose=None, |
1701 moddirstate=True, forcemerge=False, wlock=None, show_stats=True): |
1701 moddirstate=True, forcemerge=False, wlock=None, |
|
1702 show_stats=True, remind=True): |
1702 pl = self.dirstate.parents() |
1703 pl = self.dirstate.parents() |
1703 if not force and pl[1] != nullid: |
1704 if not force and pl[1] != nullid: |
1704 raise util.Abort(_("outstanding uncommitted merges")) |
1705 raise util.Abort(_("outstanding uncommitted merges")) |
1705 |
1706 |
1706 err = False |
1707 err = False |
1985 " you can redo the full merge using:\n" |
1986 " you can redo the full merge using:\n" |
1986 " hg update -C %s\n" |
1987 " hg update -C %s\n" |
1987 " hg merge %s\n" |
1988 " hg merge %s\n" |
1988 % (self.changelog.rev(p1), |
1989 % (self.changelog.rev(p1), |
1989 self.changelog.rev(p2)))) |
1990 self.changelog.rev(p2)))) |
1990 else: |
1991 elif remind: |
1991 self.ui.status(_("(branch merge, don't forget to commit)\n")) |
1992 self.ui.status(_("(branch merge, don't forget " |
|
1993 "to commit)\n")) |
1992 elif failedmerge: |
1994 elif failedmerge: |
1993 self.ui.status(_("There are unresolved merges with" |
1995 self.ui.status(_("There are unresolved merges with" |
1994 " locally modified files.\n")) |
1996 " locally modified files.\n")) |
1995 |
1997 |
1996 self.hook('update', parent1=xp1, parent2=xxp2, error=int(err)) |
1998 self.hook('update', parent1=xp1, parent2=xxp2, error=int(err)) |