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-import-dgit: add an upload to incorporate nmu
[dgit.git]
/
tests
/
tests
/
gdr-import-dgit
diff --git
a/tests/tests/gdr-import-dgit
b/tests/tests/gdr-import-dgit
index bf31ed9ad4c668ea08ebc5d4b9a8a3643e3d32ab..c4ca1ba053166babd0de2e8e50a77bd075161b34 100755
(executable)
--- a/
tests/tests/gdr-import-dgit
+++ b/
tests/tests/gdr-import-dgit
@@
-4,41
+4,61
@@
set -e
t-dependencies git-buildpackage libfile-fnmatch-perl
t-dependencies git-buildpackage libfile-fnmatch-perl
-t-setup-import g
bp2gdr
+t-setup-import g
dr-convert-gbp
cd $p
cd $p
-: 'non-dgit upload (but we prepare it with dgit anyway)'
+nmu-upload-1 () {
+ nmubranch=$1
+ git checkout -f -b $nmubranch
+ t-git-debrebase
+ t-git-debrebase convert-to-gbp
+ # now we are on a gbp patched-unapplied branch
+}
-git checkout -b nmu
-v=2.0-2+num1
-t-dch-commit -v $v -m nmu
+nmu-upload-2 () {
+ t-dch-commit -v $v -m "nmu $nmubranch $v"
+ t-some-changes "nmu $numbranch $v"
+ t-dch-commit -r sid
-t-some-changes nmu
+ t-dgit -wgf build-source
-t-dch-commit -r sid
+ cd ..
+ c=${p}_${v}_source.changes
+ debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
+ dput -c $tmp/dput.cf test-dummy $c
-t-dgit -wgf build-source
+ t-archive-process-incoming sid
+ cd $p
+ git checkout master
+}
-cd ..
-c=${p}_${v}_source.changes
-debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
-dput -c $tmp/dput.cf test-dummy $c
+: 'non-dgit upload (but we prepare it with dgit anyway)'
-t-archive-process-incoming sid
+v=2.0-2+nmu1
+nmu-upload-1 nmu
+gbp pq import
+nmu-upload-2
: 'done the nmu, switching back to the maintainer hat'
: 'done the nmu, switching back to the maintainer hat'
-cd $p
-git checkout master
-t-dgit pull
+t-dgit fetch
+git merge --ff-only dgit/dgit/sid
-git diff --exit-code nmu
+git diff --exit-code
patch-queue/
nmu
git branch t.before
t-git-debrebase
t-gdr-good laundered
git branch t.before
t-git-debrebase
t-gdr-good laundered
+t-git-debrebase stitch
+t-gdr-good stitched
+
+v=2.0-3
+t-dch-commit -v $v -m "incorporate nmu"
+t-dch-commit -r sid
+t-dgit -wgf push-source
+
t-ok
t-ok