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-edits: check branch structure after last push
[dgit.git]
/
tests
/
tests
/
gdr-edits
diff --git
a/tests/tests/gdr-edits
b/tests/tests/gdr-edits
index 70735e9e3991e0ec7b8c449c3086deedeb4f9600..30786fee76f8d2245a630538d0b0faeceb5be8fd 100755
(executable)
--- a/
tests/tests/gdr-edits
+++ b/
tests/tests/gdr-edits
@@
-8,6
+8,10
@@
t-setup-import gbp2gdr
cd $p
cd $p
+v=2.0-3
+dch -v $v -m testing
+git commit -m changelog debian/changelog
+
t-git-debrebase analyse |tee ../anal.1
cat ../anal.1
t-git-debrebase analyse |tee ../anal.1
cat ../anal.1
@@
-24,6
+28,9
@@
for f in debian/zorkmid src.c; do
done
git commit -m 'MIXED add boths'
done
git commit -m 'MIXED add boths'
+dch -r sid
+git commit -m changelog debian/changelog
+
git tag t.before
t-git-debrebase
git tag t.before
t-git-debrebase
@@
-34,7
+41,11
@@
t-gdr-branch-structure laundered
t-git-debrebase stitch --prose=wombat
t-git-debrebase stitch --prose=wombat
-: todo 'check that all is still well'
+t-gdr-branch-structure stitched
+
+t-dgit push-source
+
+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: convert dgit import new upstream version'
: todo 'more tests: convert dgit import same upstream version'