X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=tests%2Flib-gdr;h=4cfa62b0354d82f110be2f9384313bef547f5142;hb=4cb451aa46ad449116f9ff0d1a4450e6dcc01d4f;hp=f6333073cdf0ad42fedcdb672b05c5fa73ba2b7c;hpb=e13fa49a03cd782945cf142fa94232a183b8e753;p=dgit.git

diff --git a/tests/lib-gdr b/tests/lib-gdr
index f6333073..4cfa62b0 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -88,3 +88,20 @@ t-gdr-branch-structure () {
 
 	done
 }
+
+t-some-changes () {
+	local token=$1
+
+	echo >>debian/zorkmid "// debian $token"
+	git add debian/zorkmid
+	git commit -m "DEBIAN add zorkmid ($token)"
+
+	echo >>src.c "// upstream $token"
+	git commit -a -m "UPSTREAM edit src.c ($token)"
+
+	for f in debian/zorkmid src.c; do
+		echo "// both! $token" >>$f
+		git add $f
+	done
+	git commit -m "MIXED add both ($token)"
+}