Mercurial > hg

diff mercurial/merge.py @ 11470:34e33d50c26b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: correctly handle update -C with modified subrepos (issue2022) (based on a patch by Saint Germain)
author Matt Mackall <mpm@selenic.com>
date Wed, 30 Jun 2010 23:56:35 -0500
parents ad27428c59ce
children eb07fbc21e9c db426935fa94
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Jun 30 18:15:23 2010 -0500
+++ b/mercurial/merge.py	Wed Jun 30 23:56:35 2010 -0500
@@ -167,7 +167,7 @@
     m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest()
     copied = set(copy.values())
 
-    if not overwrite and '.hgsubstate' in m1:
+    if '.hgsubstate' in m1:
         # check whether sub state is modified
         for s in p1.substate:
             if p1.sub(s).dirty():