X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-gdr;h=aeb7725411eb20038eb307b525644defb7f3f77d;hb=67112402f999079ad5cc70ee2aef8f92a5483a67;hp=d6d33f7851e568ff0bcf64ea1c69dd3d2f872f1c;hpb=b2961d4e30d201c4a22e7a8659696a7dcb2e2e81;p=dgit.git

diff --git a/tests/lib-gdr b/tests/lib-gdr
index d6d33f78..aeb77254 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -22,10 +22,13 @@ t-gdr-good () {
 
 	git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
 
-	local etype netype
+	local etype netype bwtip
 
 	case $state in
-	laundered)	etype=Upstream	;;
+	laundered)
+			etype=Upstream
+			bwtip=Y:`t-git-debrebase breakwater`
+		;;
 	stitched)	etype=Pseudomerge ;;
 	pushed)		etype=AddPatches; netype=Pseudomerge ;;
 	esac
@@ -43,6 +46,7 @@ t-gdr-good () {
 		expect="$parents"
 		enparents=1
 		: "$ctype/$cetype" "$parents"
+
 		case "$ctype/$cetype" in
 		Pseudomerge/SAME)			;;
 		Packaging/SAME)				;;
@@ -58,6 +62,15 @@ t-gdr-good () {
 			;;
 		esac
 
+		case "$ctype/$etype" in
+		Packaging/Upstream|\
+		Changelog/Upstream)
+			if [ "x$bwtip" != x ]; then
+				test "$bwtip" = "Y:$cid"
+				bwtip=''
+			fi
+		esac
+
 		case "$ctype" in
 		Pseudomerge)
 			expect=${info#Contributor=}