From 075e5ee39813f272713793fd8b778c81697e24e2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Aug 2018 17:40:04 +0100 Subject: [PATCH] test suite: gdr-new-upstream: Test updating existing clog entry This is the test case for #905888. Signed-off-by: Ian Jackson --- tests/tests/gdr-newupstream | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream index 300d4345..30396691 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 -- 2.30.2