summaryrefslogtreecommitdiff
path: root/tests/tests/gdr-diverge-nmu
blob: 15bf9013ad553733bff805f95718c869cb3bccc9 (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
49
50
51
52
53
54
55
56
57
58
59
60
61
#!/bin/bash
set -e
. tests/lib

t-dependencies GDR

t-setup-import gdr-convert-gbp

cd $p

t-dgit setup-mergechangelogs

: 'maintainer'

v=2.0-3
t-maintainer-commit-some-changes

t-git-next-date

: 'non-dgit upload (but we prepare it with dgit anyway)'

t-git-next-date
git checkout origin/master

v=2.0-2+nmu1
t-nmu-upload-1 nmu
gbp pq import
t-nmu-upload-2
t-nmu-commit-an-upstream-change
t-nmu-upload-3

: 'ad hocery'

t-git-next-date
git checkout master
t-nmu-causes-ff-fail

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'

git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid

: 'right, how are we'

t-git-next-date

t-git-debrebase
t-gdr-good laundered

t-git-debrebase stitch
t-gdr-good stitched


t-nmu-reconciled-good patch-queue/nmu

t-ok