Mercurial > hg
comparison tests/test-subrepo-svn.t @ 14050:9e8a9d45945c stable
subrepo: handle svn tracked/unknown directory collisions
This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.
Using --force is not very elegant and only works with svn >= 1.5 but the only
alternative I can think of is to write our own purge command for subversion.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 04 Mar 2011 14:00:49 +0100 |
parents | 42a34c0aeddc |
children | ecaa78594983 |
comparison
equal
deleted
inserted
replaced
14025:1052b1421a48 | 14050:9e8a9d45945c |
---|---|
436 1+ | 436 1+ |
437 $ cd s | 437 $ cd s |
438 $ svnversion | 438 $ svnversion |
439 2 | 439 2 |
440 $ cd .. | 440 $ cd .. |
441 | |
442 Test case where subversion would fail to update the subrepo because there | |
443 are unknown directories being replaced by tracked ones (happens with rebase). | |
444 | |
445 $ cd $WCROOT/src | |
446 $ mkdir dir | |
447 $ echo epsilon.py > dir/epsilon.py | |
448 $ svn add dir | |
449 A dir | |
450 A dir/epsilon.py | |
451 $ svn ci -m 'Add dir/epsilon.py' | |
452 Adding src/dir | |
453 Adding src/dir/epsilon.py | |
454 Transmitting file data . | |
455 Committed revision 6. | |
456 $ cd ../.. | |
457 $ hg init rebaserepo | |
458 $ cd rebaserepo | |
459 $ svn co -r5 --quiet "$SVNREPO"/src s | |
460 $ echo "s = [svn] $SVNREPO/src" >> .hgsub | |
461 $ hg add .hgsub | |
462 $ hg ci -m addsub | |
463 committing subrepository s | |
464 $ echo a > a | |
465 $ hg ci -Am adda | |
466 adding a | |
467 $ hg up 0 | |
468 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
469 $ svn up -r6 s | |
470 A s/dir | |
471 A s/dir/epsilon.py | |
472 | |
473 Fetching external item into 's/externals' | |
474 Updated external to revision 1. | |
475 | |
476 Updated to revision 6. | |
477 $ hg ci -m updatesub | |
478 committing subrepository s | |
479 created new head | |
480 $ echo pyc > s/dir/epsilon.pyc | |
481 $ hg up 1 | |
482 D $TESTTMP/rebaserepo/s/dir | |
483 | |
484 Fetching external item into '$TESTTMP/rebaserepo/s/externals' | |
485 Checked out external at revision 1. | |
486 | |
487 Checked out revision 5. | |
488 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
489 $ if "$TESTDIR/hghave" -q svn15; then | |
490 > hg up 2 >/dev/null 2>&1 || echo update failed | |
491 > fi |