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: rename gbp2gdr to convert-from-gbp
[dgit.git]
/
tests
/
tests
/
gdr-import-dgit
diff --git
a/tests/tests/gdr-import-dgit
b/tests/tests/gdr-import-dgit
index 5d4015709619aabd85b508bd7d72d8540ed7bc2f..0522818bb6f17ea89f43cc0cab96b22d34330e4e 100755
(executable)
--- a/
tests/tests/gdr-import-dgit
+++ b/
tests/tests/gdr-import-dgit
@@
-4,7
+4,7
@@
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
@@
-34,8
+34,14
@@
cd $p
git checkout master
t-dgit pull
git checkout master
t-dgit pull
+git diff --exit-code nmu
+
git branch t.before
git branch t.before
-: t-git-debrebase launder
+t-git-debrebase
+t-gdr-good laundered
+
+t-git-debrebase stitch
+t-gdr-good stitched
t-ok
t-ok