author | Vadim Gelfer <vadim.gelfer@gmail.com> |
Mon, 07 Aug 2006 17:33:14 -0700 | |
changeset 2796 | bd4dada96c2e |
parent 2795 | 135823f37304 |
child 2797 | df220d0974dd |
hgext/fetch.py | file | annotate | diff | comparison | revisions |
--- a/hgext/fetch.py +++ b/hgext/fetch.py @@ -70,6 +70,9 @@ def fetch(ui, repo, source='default', ** '(use "hg update" to check out tip)')) if p2 != nullid: raise util.Abort(_('outstanding uncommitted merge')) + mod, add, rem = repo.status()[:3] + if mod or add or rem: + raise util.Abort(_('outstanding uncommitted changes')) if len(repo.heads()) > 1: raise util.Abort(_('multiple heads in this repository ' '(use "hg heads" and "hg merge" to merge them)'))