Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 6256:69c75d063c7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: require --force when there are deleted files
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 14 Mar 2008 09:56:58 -0300
parents a375ffc2aa1b
children 7e4f66fe964b
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Mar 14 09:56:58 2008 -0300
+++ b/mercurial/merge.py	Fri Mar 14 09:56:58 2008 -0300
@@ -609,7 +609,7 @@
             raise util.Abort(_("update spans branches, use 'hg merge' "
                                "or 'hg update -C' to lose changes"))
         if branchmerge and not forcemerge:
-            if wc.files():
+            if wc.files() or wc.deleted():
                 raise util.Abort(_("outstanding uncommitted changes"))
 
         ### calculate phase