chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: quilt-splitbrains: Drop non-wgf dpm test of gbp package
[dgit.git]
/
tests
/
tests
/
gdr-diverge-nmu
diff --git
a/tests/tests/gdr-diverge-nmu
b/tests/tests/gdr-diverge-nmu
index 8f0b9cb0135780a9de29d4457f0636c613140a1a..15bf9013ad553733bff805f95718c869cb3bccc9 100755
(executable)
--- a/
tests/tests/gdr-diverge-nmu
+++ b/
tests/tests/gdr-diverge-nmu
@@
-2,7
+2,7
@@
set -e
. tests/lib
set -e
. tests/lib
-t-dependencies
git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies
GDR
t-setup-import gdr-convert-gbp
t-setup-import gdr-convert-gbp
@@
-10,9
+10,17
@@
cd $p
t-dgit setup-mergechangelogs
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
: '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
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
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
t-git-next-date
-
+git checkout master
t-nmu-causes-ff-fail
t-nmu-causes-ff-fail
-: 'ad hocery'
-
git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}'
t-expect-fail 'Automatic merge failed; fix conflicts' \
git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}'
t-expect-fail 'Automatic merge failed; fix conflicts' \