X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge;h=14a823795eaeda4461bc61b88b75fd66f54c430a;hb=d83b380941520c668a712b0b936513373bd44278;hp=7a6ffdb63281a0345c1f967a58d2c7e50c003847;hpb=404b824d7a46eee9fe76398fda6a44a7e9cf3681;p=dgit.git

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 7a6ffdb6..14a82379 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -8,27 +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
 
 t-gdr-prep-new-upstream 2.1
@@ -37,34 +16,47 @@ git tag v2.1 upstream
 t-some-changes before
 t-git-debrebase quick
 
+: ----- prepare LH branch -----
+
 git checkout -b other
 t-some-changes other '' -other
 
+echo 'other-conflict' >>debian/zorkmid
+git commit -m 'other-conflict' debian/zorkmid
+
+: ----- prepare RH branch -----
+
 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
 
-git merge other
+: ----- introduce a vanilla merge -----
 
-t-some-changes after
-# xxx ^ commenting out this line produces an internal error
+t-merge-conflicted-stripping-conflict-markers other debian/zorkmid
 
 t-expect-fail E:'general two-parent merge' \
 t-git-debrebase
 
 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
 
+: ----- expect to be able to merge -----
+
+t-git-debrebase
+t-gdr-good laundered
+
+t-refs-same-start
+t-ref-head
 t-git-debrebase
+t-ref-head
 
-# xxx want to check that we DTRT if we start out unstitched -
-# xxx should consider our ffq-prev as a parent
-# xxx or should we ?  it's not a parent of the merge is it ?
-# xxx => user should prefer to make merges when stitched ?
-# xxx think about this later
+t-git-debrebase scrap
 
-# t-gdr-good laundered
-# xxx ^ this does not work
+t-some-changes after
+t-git-debrebase
+t-gdr-good laundered
 
 t-ok