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 nmu divergence: do maintainer first
[dgit.git]
/
tests
/
tests
/
gdr-edits
diff --git
a/tests/tests/gdr-edits
b/tests/tests/gdr-edits
index cff33b1d1e791506ac209d2078fbab081d06f570..cb2e4714aaa1cdc1521cb02eb691d473fdb6dcc9 100755
(executable)
--- a/
tests/tests/gdr-edits
+++ b/
tests/tests/gdr-edits
@@
-2,9
+2,9
@@
set -e
. tests/lib
set -e
. tests/lib
-t-dependencies git-buildpackage libfile-fnmatch-perl
+t-dependencies git-buildpackage libfile-fnmatch-perl
faketime
-t-setup-import g
bp2gdr
+t-setup-import g
dr-convert-gbp
cd $p
cd $p
@@
-21,23
+21,15
@@
t-dch-commit -r sid
git tag t.before
t-git-debrebase
git tag t.before
t-git-debrebase
-
-git diff t.before -- ':.' ':!debian/patches'
-
-t-gdr-branch-structure laundered
+t-gdr-good laundered
t-git-debrebase stitch --prose=wombat
t-git-debrebase stitch --prose=wombat
-
-t-gdr-branch-structure stitched
+t-gdr-good stitched
t-dgit push-source
t-dgit push-source
+t-gdr-good pushed
-t-gdr-branch-structure pushed
-
-: todo 'more tests: convert dgit import new upstream version'
-: todo 'more tests: convert dgit import same upstream version'
: todo 'more tests: other maint updated, we must fetch'
: todo 'more tests: other maint updated, alert divergence'
: todo 'more tests: other maint updated, we must fetch'
: todo 'more tests: other maint updated, alert divergence'
-: todo 'more tests: nmu divergence'
t-ok
t-ok