diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-26 01:14:22 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-26 01:36:40 +0100 |
commit | dddd5aa973ab883be5edae00c1f9659132f908ce (patch) | |
tree | fd0584735621442a360c265b560afc2e3d360cf1 /tests | |
parent | 49aab29ee3e3a4aa77156b490fa1132b6eae3e1d (diff) |
Test suite: Test --overwrite (without VERSION)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/tests/overwrite-chkclog | 39 |
1 files changed, 39 insertions, 0 deletions
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. |