X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fquilt-splitbrains;h=9f0ae5ff917fca0c7cf69c4931b796f93e2e9042;hp=134d243893a0c56b7426267b22894adbe17ff170;hb=950f90c24d818782a88c612cb24845b8086a281f;hpb=b73268f2c9f2043b0dc0e5d1013255b59ee7b00b diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains index 134d2438..9f0ae5ff 100755 --- a/tests/tests/quilt-splitbrains +++ b/tests/tests/quilt-splitbrains @@ -2,6 +2,8 @@ set -e . tests/lib +suitespecs+=' stable' + # This test script tests each of the split brain quilt modes, and # --quilt=linear, with a tree suitable for each of those, and pushes # them in sequence. The idea is to check that each tree is rejected @@ -21,11 +23,12 @@ suite=sid want-success () { local qmode=$1; shift - t-dgit "$@" --quilt=$qmode build-source - t-refs-same-start t-ref-head - t-dgit "$@" --quilt=$qmode push + + t-dgit "$@" --quilt=$qmode --dgit-view-save=split.b build-source + + t-dgit "$@" --quilt=$qmode --dgit-view-save=split.p push t-$qmode-pushed-good } @@ -129,5 +132,9 @@ t-dgit -wgf build-source want-success dpm +suite=stable +t-commit dpmish-stable 1.0-6 $suite + +want-success dpm --new -echo ok. +t-ok