autoimport=
. tests/lib
-t-dependencies NO-DGIT GDR
+t-dependencies GDR
t-tstunt-parsechangelog
t-setup-import gdr-convert-gbp-noarchive
-: 'do a simple test'
-
cd $p
t-gdr-prep-new-upstream 2.1
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
git commit -m 'us-conflict' debian/zorkmid
t-git-debrebase quick
-t-expect-fail E:'Merge conflict in debian/zorkmid' \
-git merge other
+: ----- introduce a vanilla merge -----
-perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' debian/zorkmid
-
-git add debian/zorkmid
-git commit --no-edit
+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
+t_gdr_xopts+=' --experimental-merge-resolution'
+
+: ----- expect to be able to merge -----
t-git-debrebase
t-gdr-good laundered
t-git-debrebase
t-gdr-good laundered
+t-dgit quilt-fixup
+t-gdr-made-patches
+
t-ok