##// END OF EJS Templates
subrepo: don't abort in add when non-hg subrepos are present (issue4513)...
Matt Harbison -
r23963:8f02682f stable
parent child Browse files
Show More
@@ -435,7 +435,7 b' class abstractsubrepo(object):'
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):
@@ -133,6 +133,7 b' clone root separately, make different lo'
133 $ echo f > f
133 $ echo f > f
134 $ hg status --subrepos
134 $ hg status --subrepos
135 ? s/f
135 ? s/f
136 $ hg add .
136 $ git add f
137 $ git add f
137 $ cd ..
138 $ cd ..
138
139
@@ -439,8 +439,9 b' are unknown directories being replaced b'
439 $ hg add .hgsub
439 $ hg add .hgsub
440 $ hg ci -m addsub
440 $ hg ci -m addsub
441 $ echo a > a
441 $ echo a > a
442 $ hg ci -Am adda
442 $ hg add .
443 adding a
443 adding a
444 $ hg ci -m adda
444 $ hg up 0
445 $ hg up 0
445 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
446 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
446 $ svn up -qr6 s
447 $ svn up -qr6 s
General Comments 0
You need to be logged in to leave comments. Login now