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: test ff stitching
[dgit.git]
/
tests
/
tests
/
gdr-edits
diff --git
a/tests/tests/gdr-edits
b/tests/tests/gdr-edits
index bab3a3dce67477eae5dd5f580c6c6ae199a70e40..45a3f20c25e4fe670730a09b0fbeb0a6847adcdb 100755
(executable)
--- a/
tests/tests/gdr-edits
+++ b/
tests/tests/gdr-edits
@@
-2,32
+2,42
@@
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
+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
t-git-debrebase
git tag t.before
t-git-debrebase
+t-gdr-good laundered
+
+t-git-debrebase stitch --prose=wombat
+t-gdr-good stitched
+
+t-dgit push-source
+t-gdr-good pushed
+
+git branch before-noop
+
+t-git-next-date
+t-git-debrebase
+t-git-debrebase stitch
+t-gdr-good pushed
-git diff t.before -- ':.' ':!debian/patches'
+t-refs-same-start
+t-ref-same refs/heads/before-noop
+t-ref-head
t-ok
t-ok