From dddd5aa973ab883be5edae00c1f9659132f908ce Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 26 Sep 2016 01:14:22 +0100 Subject: Test suite: Test --overwrite (without VERSION) Signed-off-by: Ian Jackson --- tests/tests/overwrite-chkclog | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100755 tests/tests/overwrite-chkclog (limited to 'tests/tests/overwrite-chkclog') diff --git a/tests/tests/overwrite-chkclog b/tests/tests/overwrite-chkclog new file mode 100755 index 0000000..25356a8 --- /dev/null +++ b/tests/tests/overwrite-chkclog @@ -0,0 +1,39 @@ +#!/bin/bash +set -e +. tests/lib + +t-setup-import examplegit + +cd example + +suite=stable + +t-commit 'No changes, just send to stable' '' stable + +t-dgit -wgf build + +t-expect-fail 'Perhaps debian/changelog does not mention' \ +t-dgit push --overwrite stable + +t-dgit setup-mergechangelogs + +t-expect-fail 'fix conflicts and then commit the result' \ +git merge dgit/dgit/stable + +git checkout master which +EDITOR=: git commit + +t-dgit -wgf build + +perl -i~ -pe 's/^(\w+ \(\S+)(\) stable)/$1+X$2/ if $.>1' debian/changelog +git add debian/changelog +git commit -m 'Break changelog' + +t-expect-fail 'Perhaps debian/changelog does not mention' \ +t-dgit push --overwrite stable + +git revert --no-edit 'HEAD^{/Break changelog}' + +t-dgit push --overwrite stable + +echo done. -- cgit v1.2.3