diff mercurial/subrepo.py @ 23963:8f02682ff3b0 stable

subrepo: don't abort in add when non-hg subrepos are present (issue4513) This change should have been part of 9994f45ba714.
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 27 Jan 2015 20:57:43 -0500
parents de519517f597
children 07c1a7d1ef69 756c5c8331b0
line wrap: on
line diff
--- a/mercurial/subrepo.py	Tue Jan 27 10:14:23 2015 -0500
+++ b/mercurial/subrepo.py	Tue Jan 27 20:57:43 2015 -0500
@@ -435,7 +435,7 @@
         """
         raise NotImplementedError
 
-    def add(self, ui, match, dryrun, listsubrepos, prefix, explicitonly):
+    def add(self, ui, match, prefix, explicitonly, **opts):
         return []
 
     def addremove(self, matcher, prefix, opts, dry_run, similarity):