chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: merge: test suite: Use t-ref-same-start
[dgit.git]
/
tests
/
lib-gdr
diff --git
a/tests/lib-gdr
b/tests/lib-gdr
index 1bb810fef4445ed046d078973d3fd0312333bd62..9d9fcb461a09025a173f8dc8d23af0b5ee2a8fc5 100644
(file)
--- a/
tests/lib-gdr
+++ b/
tests/lib-gdr
@@
-23,8
+23,6
@@
t-gdr-good () {
git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
- local etypes bwtip
-
LC_MESSAGES=C t-git-debrebase status >../status.check
case $state in
laundered)
LC_MESSAGES=C t-git-debrebase status >../status.check
case $state in
laundered)
@@
-37,6
+35,15
@@
t-gdr-good () {
;;
esac
;;
esac
+ t-gdr-good-analyse HEAD $state
+}
+
+t-gdr-good-analyse () {
+ local head=$1
+ local state=$2
+ local wsfx=$3
+ local etypes bwtip
+
# etypes is either a type,
# or PseudoMerge-<more etypes>
# or AddPatches-<more etypes>
# etypes is either a type,
# or PseudoMerge-<more etypes>
# or AddPatches-<more etypes>
@@
-49,11
+56,13
@@
t-gdr-good () {
stitched) etypes=Pseudomerge-Upstream ;;
pushed) etypes=AddPatches-Pseudomerge-Upstream ;;
pushed-interop) etypes=Pseudomerge-AddPatchesInterop-Upstream ;;
stitched) etypes=Pseudomerge-Upstream ;;
pushed) etypes=AddPatches-Pseudomerge-Upstream ;;
pushed-interop) etypes=Pseudomerge-AddPatchesInterop-Upstream ;;
+ breakwater) etypes=Packaging ;;
esac
esac
- t-git-debrebase analyse >../anal.check
- expect=`git rev-parse HEAD`
- exec <../anal.check
+ anal=../anal$wsfx
+ t-git-debrebase analyse $head >$anal.check
+ expect=`git rev-parse $head`
+ exec <$anal.check
local cid ctype info nparents
while read cid ctype info; do
: ===== $cid $ctype $info =====
local cid ctype info nparents
while read cid ctype info; do
: ===== $cid $ctype $info =====
@@
-69,6
+78,8
@@
t-gdr-good () {
Pseudomerge/SAME) ;;
Packaging/SAME) ;;
Packaging/Upstream) ;;
Pseudomerge/SAME) ;;
Packaging/SAME) ;;
Packaging/Upstream) ;;
+ MergedBreakwaters/Packaging) ;;
+ MergedBreakwaters/Upstream) ;;
AddPatches/SAME) ;;
AddPatches/AddPatchesInterop) ;;
Changelog/Packaging) ;;
AddPatches/SAME) ;;
AddPatches/AddPatchesInterop) ;;
Changelog/Packaging) ;;
@@
-108,9
+119,9
@@
t-gdr-good () {
: 'reject pointless pseudomerges'
local overwritten=${parents/$expect/}
overwritten=${overwritten// /}
: 'reject pointless pseudomerges'
local overwritten=${parents/$expect/}
overwritten=${overwritten// /}
- t-git-debrebase analyse $overwritten >
../
anal.overwr
+ t-git-debrebase analyse $overwritten >
$
anal.overwr
local ocid otype oinfo
local ocid otype oinfo
- read <
../
anal.overwr ocid otype oinfo
+ read <
$
anal.overwr ocid otype oinfo
case "$otype" in
Pseudomerge) test "x$info" != "x$oinfo" ;;
esac
case "$otype" in
Pseudomerge) test "x$info" != "x$oinfo" ;;
esac
@@
-133,6
+144,9
@@
t-gdr-good () {
Upstream/SAME)
git diff --quiet $expect..$cid -- ':debian'
;;
Upstream/SAME)
git diff --quiet $expect..$cid -- ':debian'
;;
+ MergedBreakwaters)
+ enparents=2
+ ;;
Anchor)
break
;;
Anchor)
break
;;
@@
-151,6
+165,19
@@
t-gdr-good () {
*) fail 'unexpected parent' ;;
esac
*) fail 'unexpected parent' ;;
esac
+ case "$ctype" in
+ MergedBreakwaters)
+ local f
+ local parent_ix=0
+ for f in $parents; do
+ t-gdr-good-analyse $f breakwater \
+ $wsfx-mp$parent_ix
+ parent_ix=$(( $parent_ix + 1 ))
+ done
+ return
+ ;;
+ esac
+
done
}
done
}
@@
-291,3
+318,14
@@
t-nmu-reconciled-good () {
git checkout master
t-dgit -wgf quilt-fixup
}
git checkout master
t-dgit -wgf quilt-fixup
}
+
+t-gdr-prep-new-upstream () {
+ uv=$1
+ t-git-next-date
+ git checkout make-upstream
+ git reset --hard upstream
+ t-make-new-upstream-tarball $uv
+ git push . make-upstream:upstream
+ git checkout master
+ t-git-next-date
+}