git-debrebase: merge: test suite: Do a bit more testing

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

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 7a6ffdb63281a0345c1f967a58d2c7e50c003847..666672faa82ac01fbf8ee07f37a26f78dfdb25e5 100755 (executable)
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -48,23 +48,19 @@ t-git-debrebase quick
 
 git merge other
 
-t-some-changes after
-# xxx ^ commenting out this line produces an internal error
-
 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-git-debrebase
+t-gdr-good laundered
+t-git-debrebase scrap
 
-# 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-gdr-good laundered
-# xxx ^ this does not work
+t-some-changes after
+t-git-debrebase
+t-gdr-good laundered
 
 t-ok