Mercurial > hg > mercurial-crew-with-dirclash
changeset 3581:be61bd32046c
use workingcontext.files() to detect if the repo is unclean
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sun, 29 Oct 2006 14:18:55 +0100 |
parents | 41989e55fa37 |
children | 9fb7d3a05882 |
files | mercurial/merge.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -392,7 +392,7 @@ def update(repo, node, branchmerge, forc else: overwrite = True if branchmerge and not forcemerge: - if wc.modified() or wc.added() or wc.removed(): + if wc.files(): raise util.Abort(_("outstanding uncommitted changes")) ### calculate phase