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: test suite: gdr-diverge-nmu-dgit: new test
[dgit.git]
/
tests
/
tests
/
gdr-diverge-nmu
diff --git
a/tests/tests/gdr-diverge-nmu
b/tests/tests/gdr-diverge-nmu
index 94fd44a6da075bfec8e36170d1c5ae0cc5128625..e647f80a0ac8bec16d36df2f6a20a9f56456fe1a 100755
(executable)
--- a/
tests/tests/gdr-diverge-nmu
+++ b/
tests/tests/gdr-diverge-nmu
@@
-18,22
+18,15
@@
v=2.0-2+nmu1
t-nmu-upload-1 nmu
gbp pq import
t-nmu-upload-2
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
: 'done the nmu, switching back to the maintainer hat'
t-git-next-date
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
+v=2.0-3
+t-maintainer-commit-some-changes
t-dgit fetch
t-git-next-date
t-dgit fetch
t-git-next-date
@@
-51,4
+44,19
@@
git merge --squash -m 'Incorporate NMU' dgit/dgit/sid
git rm -rf debian/patches
git commit -m 'Incorporate NMU'
git rm -rf debian/patches
git commit -m 'Incorporate NMU'
+git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid
+
+: 'right, how are we'
+
+t-git-next-date
+
+t-git-debrebase
+t-gdr-good laundered
+
+t-git-debrebase stitch
+t-gdr-good stitched
+
+
+t-nmu-reconciled-good patch-queue/nmu
+
t-ok
t-ok