X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-diverge-nmu;h=9951f5d7a56a574c47656e354fbc7fccaf014875;hb=bcca6a6dfc34e624274055ed1dd3fc3371a539a4;hp=6d14bba1dd1c2750fd6eb97c2f8b9b3e8826fc2b;hpb=cb12325ce0b42acee748461d0520d99cd3c3008c;p=dgit.git diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu index 6d14bba1..9951f5d7 100755 --- a/tests/tests/gdr-diverge-nmu +++ b/tests/tests/gdr-diverge-nmu @@ -10,38 +10,30 @@ 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 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 - -t-git-next-date +: 'ad hocery' -t-dgit fetch t-git-next-date - -t-expect-fail E:'Not.*fast-forward' \ -git merge --ff-only dgit/dgit/sid - -: 'ad hocery' +git checkout master +t-nmu-causes-ff-fail git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}' @@ -63,4 +55,7 @@ t-gdr-good laundered t-git-debrebase stitch t-gdr-good stitched + +t-nmu-reconciled-good patch-queue/nmu + t-ok