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