diff options
Diffstat (limited to 'tests/tests/gdr-diverge-nmu')
| -rwxr-xr-x | tests/tests/gdr-diverge-nmu | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu index 8f0b9cb..9951f5d 100755 --- a/tests/tests/gdr-diverge-nmu +++ b/tests/tests/gdr-diverge-nmu @@ -10,9 +10,17 @@ cd $p t-dgit setup-mergechangelogs +: 'maintainer' + +v=2.0-3 +t-maintainer-commit-some-changes + +t-git-next-date + : 'non-dgit upload (but we prepare it with dgit anyway)' t-git-next-date +git checkout origin/master v=2.0-2+nmu1 t-nmu-upload-1 nmu @@ -21,20 +29,12 @@ t-nmu-upload-2 t-nmu-commit-an-upstream-change t-nmu-upload-3 -: 'done the nmu, switching back to the maintainer hat' - -t-git-next-date - -v=2.0-3 -t-maintainer-commit-some-changes +: 'ad hocery' -t-dgit fetch t-git-next-date - +git checkout master t-nmu-causes-ff-fail -: 'ad hocery' - git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}' t-expect-fail 'Automatic merge failed; fix conflicts' \ |