chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: start 9.14
[dgit.git]
/
tests
/
tests
/
debpolicy-newreject
diff --git
a/tests/tests/debpolicy-newreject
b/tests/tests/debpolicy-newreject
index 4da568c3199bbec03b76bee202cfaa8a20ae0227..af02ac147d29b26405bed855ec8d31293cd8b5fd 100755
(executable)
--- a/
tests/tests/debpolicy-newreject
+++ b/
tests/tests/debpolicy-newreject
@@
-57,7
+57,8
@@
t-git-dir-check enoent
vanished=$v
vanished=$v
-t-dgit push --new --deliberately-include-questionable-history
+t-dgit push --new --deliberately-include-questionable-history \
+ --force-reusing-version
t-git-dir-check secret
t-policy-periodic
t-git-dir-check secret
t-policy-periodic
@@
-81,7
+82,7
@@
t-expect-push-fail \
"Package is in NEW and has not been accepted or rejected yet" \
t-dgit --deliberately-TEST-dgit-only-not-fast-forward push
"Package is in NEW and has not been accepted or rejected yet" \
t-dgit --deliberately-TEST-dgit-only-not-fast-forward push
-t-dgit --deliberately-not-fast-forward push
+t-dgit --deliberately-not-fast-forward
--force-reusing-version
push
cd $dgitrepo
t-expect-push-fail "Not a valid object name" \
cd $dgitrepo
t-expect-push-fail "Not a valid object name" \
@@
-94,7
+95,8
@@
t-expect-push-fail \
"Package is in NEW and has not been accepted or rejected yet" \
t-dgit push
"Package is in NEW and has not been accepted or rejected yet" \
t-dgit push
-t-dgit push --deliberately-include-questionable-history
+t-dgit push --deliberately-include-questionable-history \
+ --force-reusing-version
t-archive-process-incoming sid
t-archive-process-incoming sid
@@
-116,6
+118,6
@@
t-dgit pull
t-dgit build
t-expect-push-fail \
'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \
t-dgit build
t-expect-push-fail \
'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \
-t-dgit push
+t-dgit
--force-reusing-version
push
-echo ok.
+t-ok