git-debrebase: merge: test: Drop stuff cloned from gdr-viagit

[dgit.git] / tests / tests / gdr-merge

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index baffedfc8722ba8becd599b6993e6d84839653d5..b1a215a4890e8241e67693c8a018a10592974729 100755 (executable)
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -8,25 +8,6 @@ t-dependencies NO-DGIT GDR
 t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp-noarchive
 
-: 'set up so t-git-debrebase runs gdr via git'
-
-case "$DGIT_GITDEBREBASE_TEST" in
-''|git-debrebase)      ;;
-*)
-       t-tstunt
-       st=$tmp/tstunt/git-debrebase
-       export DGIT_GITDEBREBASE_TEST_REAL="$DGIT_GITDEBREBASE_TEST"
-       cat <<'END' >$st
-#!/bin/sh
-set -x
-exec "$DGIT_GITDEBREBASE_TEST_REAL" "$@"
-END
-       chmod +x $st
-       ;;
-esac
-
-DGIT_GITDEBREBASE_TEST='git debrebase'
-
 : 'do a simple test'
 
 cd $p
@@ -40,26 +21,42 @@ t-git-debrebase quick
 git checkout -b other
 t-some-changes other '' -other
 
+echo 'other-conflict' >>debian/zorkmid
+git commit -m 'other-conflict' debian/zorkmid
+
 git checkout master
 t-some-changes us-1 '' -us
 t-git-debrebase new-upstream 2.1
 t-some-changes us-2 '' -us
+echo 'us-conflict' >>debian/zorkmid
+git commit -m 'us-conflict' debian/zorkmid
 t-git-debrebase quick
 
+t-expect-fail E:'Merge conflict in debian/zorkmid' \
 git merge other
 
+perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' debian/zorkmid
+
+git add debian/zorkmid
+git commit --no-edit
+
 t-expect-fail E:'general two-parent merge' \
 t-git-debrebase
 
 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
 
 t-git-debrebase
+t-gdr-good laundered
+
+t-refs-same-start
+t-ref-head
+t-git-debrebase
+t-ref-head
+
 t-git-debrebase scrap
 
 t-some-changes after
 t-git-debrebase
-
-# t-gdr-good laundered
-# xxx ^ this does not work
+t-gdr-good laundered
 
 t-ok