git-debrebase: merge: Comment about laundry of merge of unstitched

I have concluded that this is not a problem avoidable by
git-debrebase, and that any trouble will be tolerable (at least, not
data loss).  The user should try to avoid doing this.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index c463f4ace5e2c5ba319d815291b922ce0780e540..2b257dd6bfea76d923a1e3da918f10c4d911ac1d 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1082,8 +1082,16 @@ sub walk ($;$$$) {
            }
            die "$ty ?";
        } elsif ($ty eq 'VanillaMerge' or $ty eq 'MergedBreakwaters') {
-           # xxx need to handle ffq if one side was unstitched
-           # wait both of them may be!
+           # User may have merged unstitched branch(es).  We will
+           # have now lost what ffq-prev was then (since the later
+           # pseudomerge may introduce further changes).  The effect
+           # of resolving such a merge is that we may have to go back
+           # further in history to find a merge base, since the one
+           # which was reachable via ffq-prev is no longer findable.
+           # This is suboptimal, but if it all works we'll have done
+           # the right thing.
+           # xxx we should warn the user in the docs about this
+
            my $ok=1;
            my $best_anchor;
            # We expect to find a dominating anchor amongst the

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 25b2ee0a22f20fe23ce6865c0eee3381bc5ca050..baffedfc8722ba8becd599b6993e6d84839653d5 100755 (executable)
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -59,12 +59,6 @@ t-git-debrebase scrap
 t-some-changes after
 t-git-debrebase
 
-# 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