Show More
@@ -467,7 +467,7 b' class hgsubrepo(abstractsubrepo):' | |||||
467 | self._repo.ui.status(_('cloning subrepo %s from %s\n') |
|
467 | self._repo.ui.status(_('cloning subrepo %s from %s\n') | |
468 | % (subrelpath(self), srcurl)) |
|
468 | % (subrelpath(self), srcurl)) | |
469 | parentrepo = self._repo._subparent |
|
469 | parentrepo = self._repo._subparent | |
470 |
shutil.rmtree(self._repo. |
|
470 | shutil.rmtree(self._repo.path) | |
471 | other, self._repo = hg.clone(self._repo._subparent.ui, {}, other, |
|
471 | other, self._repo = hg.clone(self._repo._subparent.ui, {}, other, | |
472 | self._repo.root, update=False) |
|
472 | self._repo.root, update=False) | |
473 | self._initrepo(parentrepo, source, create=True) |
|
473 | self._initrepo(parentrepo, source, create=True) |
@@ -349,6 +349,18 b' Disable progress extension and cleanup:' | |||||
349 |
|
349 | |||
350 | $ mv $HGRCPATH.no-progress $HGRCPATH |
|
350 | $ mv $HGRCPATH.no-progress $HGRCPATH | |
351 |
|
351 | |||
|
352 | Test archiving when there is a directory in the way for a subrepo | |||
|
353 | created by archive: | |||
|
354 | ||||
|
355 | $ hg clone -U . ../almost-empty | |||
|
356 | $ cd ../almost-empty | |||
|
357 | $ mkdir foo | |||
|
358 | $ echo f > foo/f | |||
|
359 | $ hg archive --subrepos -r tip archive | |||
|
360 | cloning subrepo foo from $TESTTMP/empty/foo | |||
|
361 | abort: destination '$TESTTMP/almost-empty/foo' is not empty | |||
|
362 | [255] | |||
|
363 | ||||
352 | Clone and test outgoing: |
|
364 | Clone and test outgoing: | |
353 |
|
365 | |||
354 | $ cd .. |
|
366 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now