Mercurial > public > mercurial-scm > hg-stable
diff tests/test-subrepo.t @ 14536:52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
We shouldn't try to process subrepos if .hgsub isn't present and we
should remove .hgsubstate if .hgsub is marked for removal.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 06 Jun 2011 15:17:40 -0500 |
| parents | 826a13720fbc |
| children | cd6f10dccf16 |
line wrap: on
line diff
--- a/tests/test-subrepo.t Sun Jun 05 22:26:01 2011 +0200 +++ b/tests/test-subrepo.t Mon Jun 06 15:17:40 2011 -0500 @@ -500,6 +500,7 @@ $ hg -R testdelete remove testdelete/.hgsub $ hg -R testdelete ci -m ".hgsub deleted" $ cat testdelete/.hgsubstate + bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested test repository cloning @@ -823,3 +824,36 @@ fc627a69481f $ hg -R t id e95bcfa18a35 + +Test that removing .hgsubstate doesn't break anything: + + $ hg rm -f .hgsubstate + $ hg ci -mrm + committing subrepository s + committing subrepository t + created new head + $ hg log -vr tip + changeset: 14:3941e0aa5236 + tag: tip + parent: 11:365661e5936a + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + description: + rm + + + +Test that removing .hgsub removes .hgsubstate: + + $ hg rm .hgsub + $ hg ci -mrm2 + $ hg log -vr tip + changeset: 15:8b31de9d13d1 + tag: tip + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + files: .hgsub .hgsubstate + description: + rm2 + +