changelog: finalise 2.10

[dgit.git] / tests / tests / inarchivecopy

diff --git a/tests/tests/inarchivecopy b/tests/tests/inarchivecopy
index 394a21483ea6e64cd1f0172e02ad189f85b0e8ca..b34ba333fbae71d8282e5cb5c697a65f08c7706a 100755 (executable)
--- a/tests/tests/inarchivecopy
+++ b/tests/tests/inarchivecopy
@@ -14,33 +14,34 @@ t-inarchive-copy () {
        local from=${2:-sid}
        local to=${3:-stable}
        egrep "^${vm//./\\.}" aq/package.$from.$p >>aq/package.$to.$p
-       t-archive-updated stable $p
+       t-aq-archive-updated $to $p
 }
 
 copy-check-good () {
        git diff $vtag
-       t-refs-same refs/remotes/dgit/dgit/stable
+       t-refs-same refs/remotes/dgit/dgit/$tosuite
        t-ref-head
-       t-has-parent HEAD $vtag
+       t-has-parent-or-is HEAD $vtag
 }
 
 copy-check () {
        local vm=$1
-       t-inarchive-copy $vm
+       local tosuite=${2:-stable}
+       t-inarchive-copy $vm '' $tosuite
 
        vtag=$(v=$vm t-v-tag)
 
        cd $p
         t-refs-same-start
-        t-dgit fetch stable
-        git merge --ff-only dgit/dgit/stable
+        t-dgit fetch $tosuite
+        git merge --ff-only dgit/dgit/$tosuite
 
         copy-check-good
         local fetched=$(t-sametree-parent HEAD)
        cd ..
 
        rm -rf example.cloned
-       t-dgit clone $p stable example.cloned
+       t-dgit clone $p $tosuite example.cloned
 
        cd example.cloned
         t-refs-same-start
@@ -48,13 +49,31 @@ copy-check () {
         local cloned=$(t-sametree-parent HEAD)  
        cd ..
 
+       rm -rf example.initd
+       mkdir example.initd
+       cd example.initd
+        git init
+        t-refs-same-start
+        t-dgit -p $p fetch $tosuite
+        git reset --hard refs/remotes/dgit/dgit/$tosuite
+        copy-check-good
+        local initd=$(t-sametree-parent HEAD)
+       cd ..
+
        t-refs-same-start
        t-ref-same-val fetched $fetched
        t-ref-same-val cloned $cloned
+       t-ref-same-val initd $initd
 }
 
 copy-check 2.0
 
 copy-check 2.1
 
+cd $p
+git checkout -b dgit/testing $(v=1.1 t-v-tag)
+cd ..
+
+copy-check 2.1 testing
+
 echo ok.