chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: ffq_check: Move defaults for $ff and $notff into sub
[dgit.git]
/
tests
/
tests
/
gdr-diverge-nmu
diff --git
a/tests/tests/gdr-diverge-nmu
b/tests/tests/gdr-diverge-nmu
index 6d14bba1dd1c2750fd6eb97c2f8b9b3e8826fc2b..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,38
+10,30
@@
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
gbp pq import
t-nmu-upload-2
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
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-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}'
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-git-debrebase stitch
t-gdr-good stitched
+
+t-nmu-reconciled-good patch-queue/nmu
+
t-ok
t-ok