Merge tag 'debian/6.6' into stretch-bpo

dgit release 6.6 for unstable (sid) [dgit]
[dgit distro=debian]

# gpg: Signature made Sun 05 Aug 2018 10:43:37 BST
# gpg:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key

1 files changed, 11 insertions, 1 deletions

diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands
index e59fc07..b4d8f44 100755
--- a/tests/tests/gdr-subcommands
+++ b/tests/tests/gdr-subcommands
@@ -4,6 +4,7 @@ set -e
 
 t-dependencies GDR
 
+t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp
 
 cd $p
@@ -34,10 +35,12 @@ mix-it
 
 git checkout -b unstitched-laundered master
 mix-it
+git branch before-unstitch/unstitched-laundered
 t-git-debrebase
 t-gdr-good laundered
 
 git checkout -b unstitched-mixed master
+git branch before-unstitch/unstitched-mixed
 t-git-debrebase
 mix-it
 
@@ -172,6 +175,12 @@ make_check () {
 	f*)
 		t-has-ancestor HEAD refs/heads/$before
 		;;
+	Z*)
+		t-refs-same-start
+		t-refs-same refs/heads/$work
+		t-refs-same refs/heads/before-unstitch/$startbranch
+ 		t-ref-head
+		;;
 	*)
 		fail "$1"
 		;;
@@ -194,8 +203,8 @@ subcmd	stitch		Ns	Nu	Sltf	Stf
 subcmd	prepush		Ns	Nu	Sltf	Stf
 subcmd	quick		ns	Sl	Sltf	Sl
 subcmd	conclude	"$Ec"	"$Ec"	Sltf	Sl
+subcmd	scrap		Ns	Ns	Z	Z
 subcmd	make-patches	sPft	"$Ep"	uPft	"$Ep"
-#subcmd	dgit-upload-hook Psft	"$Ep"	SPft	"$Ep"
 #
 # result codes, each one is a check:
 #   E:$pat	} this is an error (must come first)
@@ -214,6 +223,7 @@ subcmd	make-patches	sPft	"$Ep"	uPft	"$Ep"
 #   V		ffq-prev remains unchanged; implies also u
 #   s		result is stitched, debrebase-last exists and is unchanged
 #   S		result is stitch just made, remaining letters apply to result~
+#   Z		result is rewind to before changes made
 #
 #   P		result is add-patches, remaining letters apply to result~
 #