chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: Prepare for calling git-debrebase
[dgit.git]
/
tests
/
tests
/
gdr-diverge-nmu
diff --git
a/tests/tests/gdr-diverge-nmu
b/tests/tests/gdr-diverge-nmu
index 94fd44a6da075bfec8e36170d1c5ae0cc5128625..9951f5d7a56a574c47656e354fbc7fccaf014875 100755
(executable)
--- a/
tests/tests/gdr-diverge-nmu
+++ b/
tests/tests/gdr-diverge-nmu
@@
-10,45
+10,52
@@
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
'
+: '
ad hocery
'
t-git-next-date
t-git-next-date
+git checkout master
+t-nmu-causes-ff-fail
-
t-dch-commit -v2.0-3 -m 'start -3
'
+
git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}
'
-t-some-changes 'maintainer'
-t-git-debrebase
-t-git-debrebase stitch
+t-expect-fail 'Automatic merge failed; fix conflicts' \
+git merge --squash -m 'Incorporate NMU' dgit/dgit/sid
-t-git-next-date
+git rm -rf debian/patches
+git commit -m 'Incorporate NMU'
-t-dgit fetch
-t-git-next-date
+git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid
-t-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
+: 'right, how are we'
-: 'ad hocery'
+t-git-next-date
-git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}'
+t-git-debrebase
+t-gdr-good laundered
-t-
expect-fail 'Automatic merge failed; fix conflicts' \
-
git merge --squash -m 'Incorporate NMU' dgit/dgit/si
d
+t-
git-debrebase stitch
+
t-gdr-good stitche
d
-git rm -rf debian/patches
-git commit -m 'Incorporate NMU'
+
+t-nmu-reconciled-good patch-queue/nmu
t-ok
t-ok