X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-newupstream;h=30396691912872c8fd03cf91c9a4c942c5981379;hp=b45a0bfe1ea8382161a589a96651910de20a46a7;hb=8381243a5f0a311bdf8ef2c8d695d7993de76a9d;hpb=35c89cd28f7089073a4f9aafc1b60d8bdc3aca8a

diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream
index b45a0bfe..30396691 100755
--- a/tests/tests/gdr-newupstream
+++ b/tests/tests/gdr-newupstream
@@ -31,6 +31,7 @@ git branch before-new-upstream
 clog-check-1 () {
 	before=$1
 	date=$(git log --format=%aD -n1 debian/changelog)
+	date=$(date -R -d "$date")
 	git show $before:debian/changelog >../clog.before
 	m="  * Update to new upstream version ${v%-*}."
 	e="dgit test git user <dgit-test@debian.example.net>  $date"
@@ -84,4 +85,25 @@ t-gdr-good stitched
 
 git diff --quiet ordinary
 
+: ----- with pre-existing changes -----
+
+git checkout -b with-preexisting before-new-upstream
+
+t-dch-commit drivel-in-changelog
+git branch before-new-upstream-with-changes
+
+t-git-next-date
+
+t-git-debrebase new-upstream ${v%-*}
+
+clog-check-1 before-new-upstream-with-changes
+perl -pe <../clog.before >../clog.expected '
+	BEGIN { ($m,$e,@ARGV) = @ARGV; }
+	next unless 1..m/^ --/;
+	s/\([^()]+\)/('$v')/ if m/^example /;
+	$_ .= "$m\n" if m/^  \* drivel-in-changelog/;
+	$_ = " -- $e\n" if m/^ -- /;
+' "$m" "$e"
+clog-check-2
+
 t-ok