diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-17 23:26:53 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:06:58 +0100 |
commit | 2045d087abc4445b98649af8eb4883c05573a324 (patch) | |
tree | 662077e42265938b6189127cc1bec9297533bfa6 /tests/tests/gdr-diverge-nmu | |
parent | 557f90d88992e61580113baa2e4da0b4427d7cb4 (diff) |
git-debrebase: test suite: lib-gdr: break out some more t-*
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/gdr-diverge-nmu')
-rwxr-xr-x | tests/tests/gdr-diverge-nmu | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu index 9fb2c5d..9b37ca6 100755 --- a/tests/tests/gdr-diverge-nmu +++ b/tests/tests/gdr-diverge-nmu @@ -18,24 +18,15 @@ v=2.0-2+nmu1 t-nmu-upload-1 nmu gbp pq import t-nmu-upload-2 -echo >>newsrc.c "// more upstream" -git add newsrc.c -git commit -m 'UPSTREAM NMU' +t-nmu-commit-an-upstream-change t-nmu-upload-3 : 'done the nmu, switching back to the maintainer hat' t-git-next-date -t-dch-commit -v2.0-3 -m 'start -3' - -t-some-changes 'maintainer' -t-git-debrebase -t-git-debrebase stitch - -git branch did.maintainer - -t-git-next-date +v=2.0-3 +t-maintainer-commit-some-changes t-dgit fetch t-git-next-date |