mercurial/commands.py

--- a/mercurial/commands.py	Thu Oct 15 01:11:50 2015 -0700
+++ b/mercurial/commands.py	Thu Oct 15 01:15:22 2015 -0700
@@ -5617,6 +5617,19 @@
 
             didwork = True
 
+            # don't let driver-resolved files be marked
+            if ms[f] == "d":
+                exact = m.exact(f)
+                if mark:
+                    if exact:
+                        ui.warn(_('not marking %s as it is driver-resolved\n')
+                                % f)
+                elif unmark:
+                    if exact:
+                        ui.warn(_('not unmarking %s as it is driver-resolved\n')
+                                % f)
+                continue
+
             if mark:
                 ms.mark(f, "r")
             elif unmark: