cd $p
-: 'non-dgit upload (but we prepare it with dgit anyway)'
-
-git checkout -b nmu
-
-nmu-upload () {
- t-dch-commit -v $v -m nmu
+nmu-upload-1 () {
+ nmubranch=$1
+ git checkout -f -b $nmubranch
+ t-git-debrebase
+ t-git-debrebase convert-to-gbp
+ # now we are on a gbp patched-unapplied branch
+}
- t-some-changes nmu
+nmu-upload-2 () {
+ t-dch-commit -v $v -m "nmu $nmubranch $v"
+ t-some-changes "nmu $numbranch $v"
t-dch-commit -r sid
t-dgit -wgf build-source
dput -c $tmp/dput.cf test-dummy $c
t-archive-process-incoming sid
+ cd $p
+ git checkout master
}
-v=2.0-2+num1
-nmu-upload
+: 'non-dgit upload (but we prepare it with dgit anyway)'
+
+v=2.0-2+nmu1
+nmu-upload-1 nmu
+gbp pq import
+nmu-upload-2
: 'done the nmu, switching back to the maintainer hat'
-cd $p
-git checkout master
t-dgit fetch
git merge --ff-only dgit/dgit/sid
-git diff --exit-code nmu
+git diff --exit-code patch-queue/nmu
git branch t.before
t-git-debrebase stitch
t-gdr-good stitched
+v=2.0-3
+t-dch-commit -v $v -m "incorporate nmu"
+t-dch-commit -r sid
+t-dgit -wgf push-source
+
t-ok