Mercurial > hg-stable

changeset 3581:be61bd32046c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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	Sun Oct 29 13:08:10 2006 +0100
+++ b/mercurial/merge.py	Sun Oct 29 14:18:55 2006 +0100
@@ -392,7 +392,7 @@
             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