blob: 2020d8fd184eac284cdf4bb6fdf65262133558c2 (
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
40
41
42
43
44
45
46
47
48
|
#!/bin/bash
set -e
. tests/lib
t-dependencies git-buildpackage libfile-fnmatch-perl faketime
t-setup-import gdr-convert-gbp
cd $p
t-dgit setup-mergechangelogs
: 'non-dgit upload (but we prepare it with dgit anyway)'
v=2.0-2+nmu1
t-nmu-upload-1 nmu
gbp pq import
t-nmu-upload-2
echo >>newsrc.c "// more upstream"
git add newsrc.c
git commit -m 'UPSTREAM NMU'
t-nmu-upload-3
: 'done the nmu, switching back to the maintainer hat'
t-dch-commit -v2.0-3 -m 'start -3'
t-some-changes 'maintainer'
t-git-debrebase
t-git-debrebase stitch
t-dgit fetch
t-git-next-date
t-expect-fail E:'Not.*fast-forward' \
git merge --ff-only dgit/dgit/sid
: 'ad hocery'
git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}'
t-expect-fail 'Automatic merge failed; fix conflicts' \
git merge --squash -m 'Incorporate NMU' dgit/dgit/sid
git rm -rf debian/patches
git commit -m 'Incorporate NMU'
t-ok
|
