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-edits
diff --git
a/tests/tests/gdr-edits
b/tests/tests/gdr-edits
index 5388f0498bb5045a82ae638def762f65f24cd2c5..d82c2383f1ab639a022bbb28deb7cfc7eb9c989f 100755
(executable)
--- a/
tests/tests/gdr-edits
+++ b/
tests/tests/gdr-edits
@@
-4,49
+4,32
@@
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
v=2.0-3
cd $p
v=2.0-3
-dch -v $v -m testing
-git commit -m changelog debian/changelog
+t-dch-commit -v $v -m testing
t-git-debrebase analyse |tee ../anal.1
cat ../anal.1
t-git-debrebase analyse |tee ../anal.1
cat ../anal.1
-echo >>debian/zorkmid '// debian'
-git add debian/zorkmid
-git commit -m 'DEBIAN add zorkmid'
+t-some-changes edits
-echo >>src.c '// upstream'
-git commit -a -m 'UPSTREAM edit src.c'
-
-for f in debian/zorkmid src.c; do
- echo '// both!' >>$f
- git add $f
-done
-git commit -m 'MIXED add boths'
-
-dch -r sid
-git commit -m changelog debian/changelog
+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
: todo 'more tests: convert dgit import new upstream version'
: 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: nmu divergence'
: todo 'more tests: other maint updated, we must fetch'
: todo 'more tests: other maint updated, alert divergence'
: todo 'more tests: nmu divergence'