tests/test-subrepo-deep-nested-change.t
changeset 25601 3ec8351fa6ed
parent 25228 63a57a2727b6
child 25615 dc707fb35550
equal deleted inserted replaced
25600:70ac1868b707 25601:3ec8351fa6ed
   166   $ cd ..
   166   $ cd ..
   167   $ hg status -S
   167   $ hg status -S
   168   A foo/bar/abc
   168   A foo/bar/abc
   169   A sub1/foo
   169   A sub1/foo
   170   R sub1/sub2/test.txt
   170   R sub1/sub2/test.txt
       
   171 
       
   172 Archive wdir() with subrepos
       
   173   $ hg rm main
       
   174   $ hg archive -S -r 'wdir()' ../wdir
       
   175   $ diff -r . ../wdir | grep -v '\.hg$'
       
   176   Only in ../wdir: .hg_archival.txt
       
   177 
       
   178   $ find ../wdir -type f | sort
       
   179   ../wdir/.hg_archival.txt
       
   180   ../wdir/.hgsub
       
   181   ../wdir/.hgsubstate
       
   182   ../wdir/foo/bar/abc
       
   183   ../wdir/sub1/.hgsub
       
   184   ../wdir/sub1/.hgsubstate
       
   185   ../wdir/sub1/foo
       
   186   ../wdir/sub1/sub1
       
   187   ../wdir/sub1/sub2/folder/test.txt
       
   188   ../wdir/sub1/sub2/sub2
       
   189 
       
   190 Attempting to archive 'wdir()' with a missing file is handled gracefully
       
   191   $ rm sub1/sub1
       
   192   $ rm -r ../wdir
       
   193   $ hg archive -v -S -r 'wdir()' ../wdir
       
   194   $ find ../wdir -type f | sort
       
   195   ../wdir/.hg_archival.txt
       
   196   ../wdir/.hgsub
       
   197   ../wdir/.hgsubstate
       
   198   ../wdir/foo/bar/abc
       
   199   ../wdir/sub1/.hgsub
       
   200   ../wdir/sub1/.hgsubstate
       
   201   ../wdir/sub1/foo
       
   202   ../wdir/sub1/sub2/folder/test.txt
       
   203   ../wdir/sub1/sub2/sub2
       
   204 
       
   205 Continue relative path printing + subrepos
   171   $ hg update -Cq
   206   $ hg update -Cq
   172   $ touch sub1/sub2/folder/bar
   207   $ touch sub1/sub2/folder/bar
   173   $ hg addremove sub1/sub2
   208   $ hg addremove sub1/sub2
   174   adding sub1/sub2/folder/bar (glob)
   209   adding sub1/sub2/folder/bar (glob)
   175   $ hg status -S
   210   $ hg status -S
   467   R sub1/sub2/test.txt
   502   R sub1/sub2/test.txt
   468   ? foo/bar/abc
   503   ? foo/bar/abc
   469   ? sub1/sub2/untracked.txt
   504   ? sub1/sub2/untracked.txt
   470   ? sub1/sub2/x.txt
   505   ? sub1/sub2/x.txt
   471   $ hg add sub1/sub2
   506   $ hg add sub1/sub2
       
   507 
       
   508   $ hg archive -S -r 'wdir()' ../wdir2
       
   509   $ diff -r . ../wdir2 | grep -v '\.hg$'
       
   510   Only in ../wdir2: .hg_archival.txt
       
   511   Only in .: .hglf
       
   512   Only in .: foo
       
   513   Only in ./sub1/sub2: large.bin
       
   514   Only in ./sub1/sub2: test.txt
       
   515   Only in ./sub1/sub2: untracked.txt
       
   516   Only in ./sub1/sub2: x.txt
       
   517   $ find ../wdir2 -type f | sort
       
   518   ../wdir2/.hg_archival.txt
       
   519   ../wdir2/.hgsub
       
   520   ../wdir2/.hgsubstate
       
   521   ../wdir2/large.bin
       
   522   ../wdir2/main
       
   523   ../wdir2/sub1/.hgsub
       
   524   ../wdir2/sub1/.hgsubstate
       
   525   ../wdir2/sub1/sub1
       
   526   ../wdir2/sub1/sub2/folder/test.txt
       
   527   ../wdir2/sub1/sub2/large.dat
       
   528   ../wdir2/sub1/sub2/sub2
       
   529   $ hg status -S -mac -n | sort
       
   530   .hgsub
       
   531   .hgsubstate
       
   532   large.bin
       
   533   main
       
   534   sub1/.hgsub
       
   535   sub1/.hgsubstate
       
   536   sub1/sub1
       
   537   sub1/sub2/folder/test.txt
       
   538   sub1/sub2/large.dat
       
   539   sub1/sub2/sub2
       
   540 
   472   $ hg ci -Sqm 'forget testing'
   541   $ hg ci -Sqm 'forget testing'
       
   542 
       
   543 Test 'wdir()' modified file archiving with largefiles
       
   544   $ echo 'mod' > main
       
   545   $ echo 'mod' > large.bin
       
   546   $ echo 'mod' > sub1/sub2/large.dat
       
   547   $ hg archive -S -r 'wdir()' ../wdir3
       
   548   $ diff -r . ../wdir3 | grep -v '\.hg$'
       
   549   Only in ../wdir3: .hg_archival.txt
       
   550   Only in .: .hglf
       
   551   Only in .: foo
       
   552   Only in ./sub1/sub2: large.bin
       
   553   Only in ./sub1/sub2: test.txt
       
   554   Only in ./sub1/sub2: untracked.txt
       
   555   Only in ./sub1/sub2: x.txt
       
   556   $ find ../wdir3 -type f | sort
       
   557   ../wdir3/.hg_archival.txt
       
   558   ../wdir3/.hgsub
       
   559   ../wdir3/.hgsubstate
       
   560   ../wdir3/large.bin
       
   561   ../wdir3/main
       
   562   ../wdir3/sub1/.hgsub
       
   563   ../wdir3/sub1/.hgsubstate
       
   564   ../wdir3/sub1/sub1
       
   565   ../wdir3/sub1/sub2/folder/test.txt
       
   566   ../wdir3/sub1/sub2/large.dat
       
   567   ../wdir3/sub1/sub2/sub2
       
   568   $ hg up -Cq
   473 
   569 
   474 Test issue4330: commit a directory where only normal files have changed
   570 Test issue4330: commit a directory where only normal files have changed
   475   $ touch foo/bar/large.dat
   571   $ touch foo/bar/large.dat
   476   $ hg add --large foo/bar/large.dat
   572   $ hg add --large foo/bar/large.dat
   477   $ hg ci -m 'add foo/bar/large.dat'
   573   $ hg ci -m 'add foo/bar/large.dat'