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: tagupl: Use a different strategy to avoid fsck fail
[dgit.git]
/
tests
/
tests
/
gdr-makepatches7
diff --git
a/tests/tests/gdr-makepatches7
b/tests/tests/gdr-makepatches7
index 9c3971004a1627ea525e98669f70b3981f960247..935698796005f26548e983d6596a193601a1ab3b 100755
(executable)
--- a/
tests/tests/gdr-makepatches7
+++ b/
tests/tests/gdr-makepatches7
@@
-4,10
+4,20
@@
set -e
t-dependencies GDR
t-dependencies GDR
+t-tstunt-parsechangelog
t-setup-import gdr-convert-gbp
cd $p
t-setup-import gdr-convert-gbp
cd $p
+git checkout upstream/2.0
+echo '*patch*' >>.gitignore
+git commit -m nasty .gitignore
+git tag v2.1
+t-make-orig $p 2.1
+
+git checkout master
+t-git-debrebase new-upstream 2.1-1
+
t-some-changes for-rebase-fixup m
t-git-debrebase
t-some-changes for-rebase-fixup m
t-git-debrebase
@@
-17,11
+27,15
@@
t-some-changes for-dgit-fixup m
t-git-debrebase
t-git-debrebase
-t-expect-fail 'dgit: failed command:
test-suite-break-git-debreba
se' \
-t-dgit -wgf --git-debrebase=
test-suite-break-git-debreba
se quilt-fixup
+t-expect-fail 'dgit: failed command:
fal
se' \
+t-dgit -wgf --git-debrebase=
fal
se quilt-fixup
+git branch before-gdr-true
t-dgit -wgf --git-debrebase=true quilt-fixup
t-dgit -wgf --git-debrebase=true quilt-fixup
+git reset --hard before-gdr-true
+t-dgit -wgf --git-debrebase=no-such-command-exists quilt-fixup
+
t-some-changes for-make-patches-fails-then-dgit-fixup m
t-expect-fail 'Patch export produced patch amendments' \
t-some-changes for-make-patches-fails-then-dgit-fixup m
t-expect-fail 'Patch export produced patch amendments' \