From 51a8006237f3882101297df7b5c29f2d15a7641e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 18 Feb 2018 00:10:04 +0000 Subject: git-debrebase: test suite: gdr nmu divergence: do maintainer first In practical terms this is needed because we are only using one tree, and otherwise the nmu's dgit push will update dgit/dgit/sid, causing the ffq check to fail (when we fix it, in a moment). Signed-off-by: Ian Jackson --- tests/tests/gdr-diverge-nmu | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'tests/tests/gdr-diverge-nmu') 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' \ -- cgit v1.2.3