diff options
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 |