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>
}
t-nmu-causes-ff-fail () {
+ t-dgit fetch
+
t-expect-fail E:'Not.*fast-forward' \
git merge --ff-only dgit/dgit/sid
}
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
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' \
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
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' \