From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 10 Mar 2017 15:35:04 +0000 (+0000)
Subject: git-debrebase: wip
X-Git-Tag: archive/debian/5.0~375
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b277db469c8d5a02132ef4a52cf2abea6305fcee;p=dgit.git

git-debrebase: wip
---

diff --git a/git-debrebase b/git-debrebase
index 1c902a26..f77566c9 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");
 }