chiark / gitweb /
git-debrebase: test suite: lib-gdr: introduce t-nmu-upload-3
[dgit.git] / tests / tests / gdr-import-dgit
1 #!/bin/bash
2 set -e
3 . tests/lib
4
5 t-dependencies git-buildpackage libfile-fnmatch-perl faketime
6
7 t-setup-import gdr-convert-gbp
8
9 cd $p
10
11 : 'non-dgit upload (but we prepare it with dgit anyway)'
12
13 v=2.0-2+nmu1
14 t-nmu-upload-1 nmu
15 gbp pq import
16 t-nmu-upload-2
17 t-some-changes $numbranch
18 t-nmu-upload-3
19
20 : 'done the nmu, switching back to the maintainer hat'
21
22 nmu-fold () {
23         t-git-next-date
24         t-dgit fetch
25         t-git-next-date
26         git merge --ff-only dgit/dgit/sid
27
28         git diff --exit-code patch-queue/$nmubranch
29
30         git branch unlaundered.$nmubranch
31
32         t-git-debrebase
33         t-gdr-good laundered
34
35         t-git-debrebase stitch
36         t-gdr-good stitched
37 }
38
39 nmu-fold
40
41 v=2.0-3
42 t-dch-commit -v $v -m "incorporate nmu"
43 t-dch-commit -r sid
44 t-dgit -wgf push-source
45
46 : 'now test a new upstream'
47
48 t-make-new-upstream-tarball 2.1
49
50 git checkout master
51 v=2.1-0+nmu1
52 t-nmu-upload-1 nmu2
53
54 gbp import-orig --upstream-version=2.1 --debian-branch=nmu2 ../$ust
55 t-dch-commit -v $v -m "new upstream $v"
56 gbp pq import
57
58 #t-dgit -wgf build-source
59
60 t-nmu-upload-2
61 t-some-changes $numbranch
62 t-nmu-upload-3
63
64 : 'done the nmu, back to the maintainer'
65
66 nmu-fold
67
68 t-ok