X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge;fp=tests%2Ftests%2Fgdr-merge;h=14a823795eaeda4461bc61b88b75fd66f54c430a;hp=60146913f93e6d84d26e4d3590145c29584ecd39;hb=fad5cfbb7f5309a5f976990883d875e5d38bc000;hpb=c1e0f468347b80d739d6eefa9eb9d614b18c3c15

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 60146913..14a82379 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -8,8 +8,6 @@ t-dependencies NO-DGIT GDR
 t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp-noarchive
 
-: 'do a simple test'
-
 cd $p
 
 t-gdr-prep-new-upstream 2.1
@@ -18,12 +16,16 @@ 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
@@ -32,6 +34,8 @@ echo 'us-conflict' >>debian/zorkmid
 git commit -m 'us-conflict' debian/zorkmid
 t-git-debrebase quick
 
+: ----- introduce a vanilla merge -----
+
 t-merge-conflicted-stripping-conflict-markers other debian/zorkmid
 
 t-expect-fail E:'general two-parent merge' \
@@ -39,6 +43,8 @@ t-git-debrebase
 
 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
 
+: ----- expect to be able to merge -----
+
 t-git-debrebase
 t-gdr-good laundered