Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/localrepo.py @ 2264:fdb699b5e132
localrepo.update: abort if outstanding merges, instead of warn/return 1
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 11 May 2006 09:43:50 -0700 |
parents | 181b0643ffb1 |
children | 3f7692b0ff13 |
comparison
equal
deleted
inserted
replaced
2262:3d48eb68f3ee | 2264:fdb699b5e132 |
---|---|
1562 | 1562 |
1563 def update(self, node, allow=False, force=False, choose=None, | 1563 def update(self, node, allow=False, force=False, choose=None, |
1564 moddirstate=True, forcemerge=False, wlock=None, show_stats=True): | 1564 moddirstate=True, forcemerge=False, wlock=None, show_stats=True): |
1565 pl = self.dirstate.parents() | 1565 pl = self.dirstate.parents() |
1566 if not force and pl[1] != nullid: | 1566 if not force and pl[1] != nullid: |
1567 self.ui.warn(_("aborting: outstanding uncommitted merges\n")) | 1567 raise util.Abort(_("outstanding uncommitted merges")) |
1568 return 1 | |
1569 | 1568 |
1570 err = False | 1569 err = False |
1571 | 1570 |
1572 p1, p2 = pl[0], node | 1571 p1, p2 = pl[0], node |
1573 pa = self.changelog.ancestor(p1, p2) | 1572 pa = self.changelog.ancestor(p1, p2) |