wip

diff --git a/git-debrebase b/git-debrebase
index 90b7b6c068a457fe8fb513b2e017bb9aeb1c75ca..d55cdeb5326f40b9c9a199c73c49721f842e9caa 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");
 }