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
/
gbp-orig
diff --git
a/tests/tests/gbp-orig
b/tests/tests/gbp-orig
index ffc145f3df2184178330047035b902155712c164..9a4937cb1e6f0fc91a9fd6a17d8152d45a13c709 100755
(executable)
--- a/
tests/tests/gbp-orig
+++ b/
tests/tests/gbp-orig
@@
-3,6
+3,8
@@
set -e
. tests/lib
t-tstunt-parsechangelog
. tests/lib
t-tstunt-parsechangelog
+t-tstunt-debuild
+t-tstunt-lintian
t-archive-none example
t-git-none
t-archive-none example
t-git-none
@@
-36,7
+38,7
@@
git commit -m 'Import 1.0'
git tag upstream/1.0
git checkout quilt-tip
git tag upstream/1.0
git checkout quilt-tip
-t-git-pseudo-merge upstream
+t-git-pseudo-merge
-m 'gbp-orig pseudomerge'
upstream
v=1.0-1
v=1.0-1
@@
-72,4
+74,4
@@
done
cd $tmp
diff -ruN gbp-output/tar-x tar-x
cd $tmp
diff -ruN gbp-output/tar-x tar-x
-echo done.
+t-ok