diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-17 19:23:02 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:04:33 +0100 |
| commit | 5b79751a25c556b457c0c429041bee2219d552f0 (patch) | |
| tree | 999aaa303c6cc339c5053d224aa0f521d758bbf2 /tests/tests/gdr-import-dgit | |
| parent | f59ad0b300d08bbc4ce630188d3fc990003ffdaf (diff) | |
git-debrebase: test suite: gdr-*: add a bunch of calls to t-git-next-date
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/gdr-import-dgit')
| -rwxr-xr-x | tests/tests/gdr-import-dgit | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit index 62ae124..3d8d954 100755 --- a/tests/tests/gdr-import-dgit +++ b/tests/tests/gdr-import-dgit @@ -9,15 +9,18 @@ t-setup-import gdr-convert-gbp cd $p nmu-upload-1 () { + t-git-next-date nmubranch=$1 git checkout -f -b $nmubranch t-git-debrebase t-git-debrebase convert-to-gbp + t-git-next-date # now we are on a gbp patched-unapplied branch } nmu-upload-2 () { + t-git-next-date t-dch-commit -v $v -m "nmu $nmubranch $v" t-some-changes "nmu $numbranch $v" t-dch-commit -r sid @@ -30,6 +33,7 @@ nmu-upload-2 () { dput -c $tmp/dput.cf test-dummy $c t-archive-process-incoming sid + t-git-next-date cd $p git checkout master } @@ -44,7 +48,9 @@ nmu-upload-2 : 'done the nmu, switching back to the maintainer hat' nmu-fold () { + t-git-next-date t-dgit fetch + t-git-next-date git merge --ff-only dgit/dgit/sid git diff --exit-code patch-queue/$nmubranch |