diff options
Diffstat (limited to 'tests/tests')
| -rwxr-xr-x | tests/tests/gdr-import-dgit | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit index c4ca1ba..62ae124 100755 --- a/tests/tests/gdr-import-dgit +++ b/tests/tests/gdr-import-dgit @@ -43,18 +43,23 @@ nmu-upload-2 : '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 +} -t-git-debrebase stitch -t-gdr-good stitched +nmu-fold v=2.0-3 t-dch-commit -v $v -m "incorporate nmu" |