[PATCH] subrepo “unknown revision” when updating with changes in sub [issue 2217]

[Pradeepkumar Gayam]

# HG changeset patch
# User Pradeepkumar Gayam <in3xes at gmail.com>
# Date 1275796315 -19800
# Node ID e66b49dfecac2bf0965e2c02e1581cd1b9951e24
# Parent  0e5ce2325795325e41f6df9203373d2858e88f88
subrepo “unknown revision” when updating with changes in sub [issue 2217]

diff -r 0e5ce2325795 -r e66b49dfecac mercurial/merge.py
--- a/mercurial/merge.py	Sat Jun 05 09:58:02 2010 -0500
+++ b/mercurial/merge.py	Sun Jun 06 09:21:55 2010 +0530
@@ -173,8 +173,11 @@
         # check whether sub state is modified
         for s in p1.substate:
             if p1.sub(s).dirty():
-                m1['.hgsubstate'] += "+"
-                break
+                w = p1.sub(s)._repo[None]
+                if w.dirty():
+                    raise util.Abort(_("uncommitted changes in subrepo %s ") %s)
+                else:
+                    break
 
     # Compare manifests
     for f, n in m1.iteritems():