cd $p
-: 'non-dgit upload (but we prepare it with dgit anyway)'
+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
+}
-git checkout -b nmu
-v=2.0-2+num1
-t-dch-commit -v $v -m 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-some-changes nmu
+ t-dgit -wgf build-source
-t-dch-commit -r sid
+ cd ..
+ c=${p}_${v}_source.changes
+ debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
+ dput -c $tmp/dput.cf test-dummy $c
-t-dgit -wgf build-source
+ t-archive-process-incoming sid
+ cd $p
+ git checkout master
+}
-cd ..
-c=${p}_${v}_source.changes
-debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
-dput -c $tmp/dput.cf test-dummy $c
+: 'non-dgit upload (but we prepare it with dgit anyway)'
-t-archive-process-incoming sid
+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 pull
+nmu-fold () {
+ t-dgit fetch
+ git merge --ff-only dgit/dgit/sid
-git diff --exit-code nmu
+ git diff --exit-code patch-queue/$nmubranch
-git branch t.before
+ git branch unlaundered.$nmubranch
-t-git-debrebase
-t-gdr-good laundered
+ t-git-debrebase
-t-git-debrebase stitch
-t-gdr-good stitched
+ t-gdr-good laundered
+
+ t-git-debrebase stitch
+ t-gdr-good stitched
+}
+
+nmu-fold
+
+v=2.0-3
+t-dch-commit -v $v -m "incorporate nmu"
+t-dch-commit -r sid
+t-dgit -wgf push-source
t-ok