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: introduce t-some-changes
[dgit.git]
/
tests
/
tests
/
gdr-edits
diff --git
a/tests/tests/gdr-edits
b/tests/tests/gdr-edits
index ddb354d8f870036425f70554a4a3fedf12a6372c..cff33b1d1e791506ac209d2078fbab081d06f570 100755
(executable)
--- a/
tests/tests/gdr-edits
+++ b/
tests/tests/gdr-edits
@@
-8,21
+8,15
@@
t-setup-import gbp2gdr
cd $p
cd $p
+v=2.0-3
+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'
-
-echo >>src.c '// upstream'
-git commit -a -m 'UPSTREAM edit src.c'
+t-some-changes edits
-for f in debian/zorkmid src.c; do
- echo '// both!' >>$f
- git add $f
-done
-git commit -m 'MIXED add boths'
+t-dch-commit -r sid
git tag t.before
git tag t.before
@@
-30,11
+24,15
@@
t-git-debrebase
git diff t.before -- ':.' ':!debian/patches'
git diff t.before -- ':.' ':!debian/patches'
-: todo 'check that the branch has the expected structure'
+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'