From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 22:51:16 +0000 (+0000)
Subject: git-debrebase: do not bomb on totally ambiguous pseudomerges
X-Git-Tag: archive/debian/5.0~161
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=c386ae2688431a622f9d41b3668755420fcbed39;hp=ebf4736038f724689ccc6177d222483fd023866d;ds=sidebyside

git-debrebase: do not bomb on totally ambiguous pseudomerges

Actually, we want `git-merge -s ours' (or `git-debrebase stitch')
to be comprehended.  We sacrifice `git-merge -s theirs'.

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

diff --git a/git-debrebase b/git-debrebase
index 3d837272..932a3b7a 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -461,7 +461,8 @@ sub classify ($) {
 	} elsif ($order < 0) {
 	    @bytime = reverse @bytime;
 	} else {
-	    return $unknown->('merge of two identical same-age parents');
+	    # same age, default to order made by -s ours
+	    # that is, commit was made by someone who preferred L
 	}
 	return $classify->(qw(Pseudomerge),
 			   SubType => qw(Ambiguous),