chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: finalise 2.10
[dgit.git]
/
tests
/
tests
/
inarchivecopy
diff --git
a/tests/tests/inarchivecopy
b/tests/tests/inarchivecopy
index c83a5d36fffe4c6bc871e7d9454ed0b11d16533e..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
local from=${2:-sid}
local to=${3:-stable}
egrep "^${vm//./\\.}" aq/package.$from.$p >>aq/package.$to.$p
- t-a
rchive-updated stable
$p
+ t-a
q-archive-updated $to
$p
}
copy-check-good () {
git diff $vtag
}
copy-check-good () {
git diff $vtag
- t-refs-same refs/remotes/dgit/dgit/
stabl
e
+ t-refs-same refs/remotes/dgit/dgit/
$tosuit
e
t-ref-head
t-has-parent-or-is HEAD $vtag
}
copy-check () {
local vm=$1
t-ref-head
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
vtag=$(v=$vm t-v-tag)
cd $p
t-refs-same-start
- t-dgit fetch
stabl
e
- git merge --ff-only dgit/dgit/
stabl
e
+ t-dgit fetch
$tosuit
e
+ git merge --ff-only dgit/dgit/
$tosuit
e
copy-check-good
local fetched=$(t-sametree-parent HEAD)
cd ..
rm -rf example.cloned
copy-check-good
local fetched=$(t-sametree-parent HEAD)
cd ..
rm -rf example.cloned
- t-dgit clone $p
stabl
e example.cloned
+ t-dgit clone $p
$tosuit
e example.cloned
cd example.cloned
t-refs-same-start
cd example.cloned
t-refs-same-start
@@
-48,13
+49,31
@@
copy-check () {
local cloned=$(t-sametree-parent HEAD)
cd ..
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-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
}
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.
echo ok.