chiark / gitweb /
git-debrebase: test suite: lib-gdr: move t-nmu-upload-[12]
[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
18 : 'done the nmu, switching back to the maintainer hat'
19
20 nmu-fold () {
21         t-git-next-date
22         t-dgit fetch
23         t-git-next-date
24         git merge --ff-only dgit/dgit/sid
25
26         git diff --exit-code patch-queue/$nmubranch
27
28         git branch unlaundered.$nmubranch
29
30         t-git-debrebase
31         t-gdr-good laundered
32
33         t-git-debrebase stitch
34         t-gdr-good stitched
35 }
36
37 nmu-fold
38
39 v=2.0-3
40 t-dch-commit -v $v -m "incorporate nmu"
41 t-dch-commit -r sid
42 t-dgit -wgf push-source
43
44 : 'now test a new upstream'
45
46 t-make-new-upstream-tarball 2.1
47
48 git checkout master
49 v=2.1-0+nmu1
50 t-nmu-upload-1 nmu2
51
52 gbp import-orig --upstream-version=2.1 --debian-branch=nmu2 ../$ust
53 t-dch-commit -v $v -m "new upstream $v"
54 gbp pq import
55
56 #t-dgit -wgf build-source
57
58 t-nmu-upload-2
59
60 : 'done the nmu, back to the maintainer'
61
62 nmu-fold
63
64 t-ok