Mercurial > public > mercurial-scm > hg-stable
comparison 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 |
comparison
equal
deleted
inserted
replaced
23962:1f3b94e8dc40 | 23963:8f02682ff3b0 |
---|---|
433 | 433 |
434 This may be a no-op on some systems. | 434 This may be a no-op on some systems. |
435 """ | 435 """ |
436 raise NotImplementedError | 436 raise NotImplementedError |
437 | 437 |
438 def add(self, ui, match, dryrun, listsubrepos, prefix, explicitonly): | 438 def add(self, ui, match, prefix, explicitonly, **opts): |
439 return [] | 439 return [] |
440 | 440 |
441 def addremove(self, matcher, prefix, opts, dry_run, similarity): | 441 def addremove(self, matcher, prefix, opts, dry_run, similarity): |
442 self.ui.warn("%s: %s" % (prefix, _("addremove is not supported"))) | 442 self.ui.warn("%s: %s" % (prefix, _("addremove is not supported"))) |
443 return 1 | 443 return 1 |