tests/test-subrepo-svn.t
branchstable
changeset 13559 42a34c0aeddc
parent 13531 67fbe566eff1
child 13907 a0ed0d0dd713
child 14050 9e8a9d45945c
equal deleted inserted replaced
13557:7509e36eed3b 13559:42a34c0aeddc
   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   $ hg up 2
       
   490   E    $TESTTMP/rebaserepo/s/dir
       
   491   A    $TESTTMP/rebaserepo/s/dir/epsilon.py
       
   492   
       
   493   Fetching external item into '$TESTTMP/rebaserepo/s/externals'
       
   494   Checked out external at revision 1.
       
   495   
       
   496   Checked out revision 6.
       
   497   1 files updated, 0 files merged, 1 files removed, 0 files unresolved