X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Foverwrite-splitbrains;h=0ef03f65369b216df446b46a64eadf467ed17ed0;hb=81b54cfc353832f717ad514b7c6a14e55a380b7d;hp=c0c7470d9d39c41320d6e46cac7124f7589e4110;hpb=5dfc6a96cc69cd63ba7ff3be90d909391cf717b3;p=dgit.git diff --git a/tests/tests/overwrite-splitbrains b/tests/tests/overwrite-splitbrains index c0c7470d..0ef03f65 100755 --- a/tests/tests/overwrite-splitbrains +++ b/tests/tests/overwrite-splitbrains @@ -7,7 +7,7 @@ t-tstunt-parsechangelog t-gbp-example-prep-no-ff t-newtag -t-dgit --quilt=gbp build-source +t-dgit --quilt=gbp --dgit-view-save=split.b build-source t-dgit fetch @@ -15,13 +15,13 @@ t-refs-same-start t-ref-head t-expect-fail 'check failed (maybe --overwrite is needed' \ -t-dgit --quilt=gbp push +t-dgit --quilt=gbp --dgit-view-save=split.p push t-refs-same-start t-ref-head -t-dgit --quilt=gbp --overwrite push +t-dgit --quilt=gbp --dgit-view-save=split.p --overwrite push t-gbp-pushed-good -echo ok. +t-ok