git-debrebase: wip

diff --git a/git-debrebase b/git-debrebase
index 1c902a262266db30d864c2e10d79c6180e692947..f77566c9efd482e17c8f490bd5f2c054a861aad8 100755 (executable)
--- 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");
 }