: 'done the nmu, switching back to the maintainer hat'
-t-dgit fetch
-git merge --ff-only dgit/dgit/sid
+nmu-fold () {
+ t-dgit fetch
+ git merge --ff-only dgit/dgit/sid
-git diff --exit-code patch-queue/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-gdr-good laundered
+
+ t-git-debrebase stitch
+ t-gdr-good stitched
+}
+
+nmu-fold
-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