Mercurial > public > mercurial-scm > hg-stable
diff tests/test-subrepo-svn.t @ 14664:0ae98cd2a83f
svn subrepos: work around checkout obstructions (issue2752)
We do this by ensuring the working copy is clean and then blowing away
the working copy and replacing it with one from the desired path. We
could probably use 'svn switch' to do this more efficiently, but
there's some subtle logic required to get that right and this is
more likely to work reliably.
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Fri, 17 Jun 2011 15:22:50 -0500 |
| parents | ecaa78594983 |
| children | 7ef125fa9b35 |
line wrap: on
line diff
--- a/tests/test-subrepo-svn.t Fri Jun 17 15:21:02 2011 -0500 +++ b/tests/test-subrepo-svn.t Fri Jun 17 15:22:50 2011 -0500 @@ -489,3 +489,33 @@ $ if "$TESTDIR/hghave" -q svn15; then > hg up 2 >/dev/null 2>&1 || echo update failed > fi + +Modify one of the externals to point to a different path so we can +test having obstructions when switching branches on checkout: + $ hg checkout tip + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ echo "obstruct = [svn] $SVNREPO/externals" >> .hgsub + $ svn co -r5 --quiet "$SVNREPO"/externals obstruct + $ hg commit -m 'Start making obstructed wc' + committing subrepository obstruct + $ hg book other + $ hg co -r 'p1(tip)' + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ echo "obstruct = [svn] $SVNREPO/src" >> .hgsub + $ svn co -r5 --quiet "$SVNREPO"/src obstruct + $ hg commit -m 'Other branch which will be obstructed' + committing subrepository obstruct + created new head + +Switching back to the head where we have another path mapped to the +same subrepo should work if the subrepo is clean. + $ hg co other + A $TESTTMP/rebaserepo/obstruct/other + Checked out revision 1. + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + +This is surprising, but is also correct based on the current code: + $ echo "updating should (maybe) fail" > obstruct/other + $ hg co tip + abort: crosses branches (merge branches or use --clean to discard changes) + [255]