Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 14663:88cb01c4575e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: check wc.dirty() before setting overwrite=True merge.update() was missing a few dirtiness checks from workingcontext, including subrepo cleanliness checks. Using wc.dirty() instead of one-off checks for various forms of dirtiness will be significantly safer.
author Augie Fackler <durin42@gmail.com>
date Fri, 17 Jun 2011 15:21:02 -0500
parents 610873cf064a
children 28e98a8b173d
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Jun 16 15:26:17 2011 -0500
+++ b/mercurial/merge.py	Fri Jun 17 15:21:02 2011 -0500
@@ -525,7 +525,7 @@
         elif not overwrite:
             if pa == p1 or pa == p2: # linear
                 pass # all good
-            elif wc.files() or wc.deleted():
+            elif wc.dirty(missing=True):
                 raise util.Abort(_("crosses branches (merge branches or use"
                                    " --clean to discard changes)"))
             elif onode is None: