blob: 3544390a83524ca75d3ac528a886548872b33b83 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
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
t-ok
|
