diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-18 00:10:04 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:06:58 +0100 |
| commit | 51a8006237f3882101297df7b5c29f2d15a7641e (patch) | |
| tree | 369c5318aa205c5415eef2141df0c2aff883e251 /tests/tests | |
| parent | fe0439371d17132ccb6b7a00f1ee57c0576e44fc (diff) | |
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 <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
| -rwxr-xr-x | tests/tests/gdr-diverge-nmu | 20 | ||||
| -rwxr-xr-x | tests/tests/gdr-diverge-nmu-dgit | 23 |
2 files changed, 22 insertions, 21 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' \ diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit index 02fb2f7..bb6a19f 100755 --- a/tests/tests/gdr-diverge-nmu-dgit +++ b/tests/tests/gdr-diverge-nmu-dgit @@ -10,9 +10,18 @@ cd $p t-dgit setup-mergechangelogs +: 'maintainer' + +git checkout master + +v=2.0-3 +t-maintainer-commit-some-changes + +t-git-next-date + : 'nmu' -git checkout -b nmu +git checkout -b nmu origin/master~0 t-git-next-date @@ -25,20 +34,12 @@ t-dgit -wgf push-source t-archive-process-incoming sid -: 'maintainer' - -git checkout master - -v=2.0-3 -t-maintainer-commit-some-changes +: 'rebase nmu onto our branch' -t-dgit fetch t-git-next-date - +git checkout master t-nmu-causes-ff-fail -: 'rebase nmu onto our branch' - git checkout dgit/dgit/sid # detach t-expect-fail 'E:CONFLICT.*Commit Debian 3\.0 \(quilt\) metadata' \ |