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: Honour DGIT_SCHROOT_CHROOT to set the schroot to use for the sbuild tests.
[dgit.git]
/
tests
/
tests
/
overwrite-splitbrains
diff --git
a/tests/tests/overwrite-splitbrains
b/tests/tests/overwrite-splitbrains
index 725357d0790f581e5d29285297dd4f1c263de1b8..06d1a987159dded6c3df000c1e1f197ff7164679 100755
(executable)
--- a/
tests/tests/overwrite-splitbrains
+++ b/
tests/tests/overwrite-splitbrains
@@
-14,7
+14,7
@@
t-dgit fetch
t-refs-same-start
t-ref-head
t-refs-same-start
t-ref-head
-t-expect-fail '
check failed (
maybe --overwrite is needed' \
+t-expect-fail 'maybe --overwrite is needed' \
t-dgit --quilt=gbp --dgit-view-save=split.p push
t-refs-same-start
t-dgit --quilt=gbp --dgit-view-save=split.p push
t-refs-same-start
@@
-24,4
+24,4
@@
t-dgit --quilt=gbp --dgit-view-save=split.p --overwrite push
t-gbp-pushed-good
t-gbp-pushed-good
-echo ok.
+t-ok