From 2735b0e2778fcc07edebb50c5e50d20dd6831611 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 10 Mar 2017 15:35:04 +0000
Subject: [PATCH] wip

---
 git-debrebase | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-debrebase b/git-debrebase
index 90b7b6c0..d55cdeb5 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -279,8 +279,9 @@ sub classify ($) {
 	!($p[0]{Differs} & ~D_DEB) &&
 	!($p[1]{Differs} & ~D_UPS)) {
 	return $classify->(qw(BreakwaterUpstreamMerge),
-			   Upstream => $p[1]);
+			   OrigParents => [ $p[1] ]);
     }
+    # xxx multi-.orig upstreams
 
     return $unknown->("complex merge");
 }
-- 
2.30.2