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: merge: test suite: Check wreckage saving
[dgit.git]
/
tests
/
tests
/
gdr-viagit
diff --git
a/tests/tests/gdr-viagit
b/tests/tests/gdr-viagit
index a83e622b175f697c23ece0ee144357dd7c8bee15..0495eb1a87fad4b5e2107d49479011256c24fc36 100755
(executable)
--- a/
tests/tests/gdr-viagit
+++ b/
tests/tests/gdr-viagit
@@
-5,6
+5,7
@@
autoimport=
t-dependencies NO-DGIT GDR
t-dependencies NO-DGIT GDR
+t-tstunt-parsechangelog
t-setup-import gdr-convert-gbp-noarchive
: 'set up so t-git-debrebase runs gdr via git'
t-setup-import gdr-convert-gbp-noarchive
: 'set up so t-git-debrebase runs gdr via git'
@@
-38,4
+39,18
@@
t-gdr-good laundered
t-git-debrebase stitch --prose=wombat
t-gdr-good stitched
t-git-debrebase stitch --prose=wombat
t-gdr-good stitched
+: ----- test scrap -----
+
+t-refs-same-start
+t-ref-head
+
+t-git-debrebase
+t-gdr-good laundered
+
+t-some-changes
+t-git-debrebase scrap
+t-gdr-good stitched
+
+t-ref-head
+
t-ok
t-ok