summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-25 17:40:04 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-26 01:20:44 +0100
commit075e5ee39813f272713793fd8b778c81697e24e2 (patch)
treef33260fc4eb856fc07e38840da2884c944ad0a93 /tests
parentb6c697655db17a9080849ab40dba7b5a737ffb81 (diff)
test suite: gdr-new-upstream: Test updating existing clog entry
This is the test case for #905888. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/tests/gdr-newupstream21
1 files changed, 21 insertions, 0 deletions
diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream
index 300d434..3039669 100755
--- a/tests/tests/gdr-newupstream
+++ b/tests/tests/gdr-newupstream
@@ -85,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