git-debrebase: WIP

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index a00b4b5589f95617c1a5b265453c832ebcaecaac..c25c18d9e91739b1f10dd392fac2ff93b135197b 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -34,7 +34,7 @@
 #
 #  refs/ffrebase-prev/BRANCH    BRANCH may be refs/...; if not it means
 #  refs/ffrebase-base/BRANCH      refs/heads/BRANCH
-
+#                               zero, one, or both of these may exist
 
 use strict;
 
@@ -198,7 +198,7 @@ sub classify ($) {
 }
 
 sub launder ($;$) {
-    my ($cur, $wantdebonly) = @_;
+    my ($cur, $pseudos_must_overwrite, $wantdebonly) = @_;
     # go through commits backwards
     # we generate two lists of commits to apply
     my (@deb_cl, @ups_cl);
@@ -241,6 +241,8 @@ sub launder ($;$) {
            $queue->(\@ups_cl, "upstream");
            next;
        } elsif ($ty eq 'Pseudomerge') {
+           if (defined $pseudos_must_overwrite) {
+           }
            push @pseudomerges, $cl;
            $cur = $ty->{Contributor};
            next;