chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
test suite: Test dgit branch_is_gdr walker on a merge resolution
[dgit.git]
/
tests
/
tests
/
gdr-merge
diff --git
a/tests/tests/gdr-merge
b/tests/tests/gdr-merge
index d2df2b84dba75ea3178be360ca0c1dea89728ed6..78b79e9b9bc74e1ba47c6d77a49c198b3074e8a5 100755
(executable)
--- a/
tests/tests/gdr-merge
+++ b/
tests/tests/gdr-merge
@@
-3,7
+3,7
@@
set -e
autoimport=
. tests/lib
-t-dependencies
NO-DGIT
GDR
+t-dependencies GDR
t-tstunt-parsechangelog
t-setup-import gdr-convert-gbp-noarchive
@@
-59,4
+59,7
@@
t-some-changes after
t-git-debrebase
t-gdr-good laundered
+t-dgit quilt-fixup
+t-gdr-made-patches
+
t-ok