git-debrebase: WIP

diff --git a/git-debrebase b/git-debrebase
index a00b4b5589f95617c1a5b265453c832ebcaecaac..ffe06e69835a14ba484847008a144867e3941ea4 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -198,7 +198,7 @@ sub classify ($) {
 }
 
 sub launder ($;$) {
 }
 
 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);
     # 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') {
            $queue->(\@ups_cl, "upstream");
            next;
        } elsif ($ty eq 'Pseudomerge') {

+           if (defined $pseudos_must_overwrite) {
+           }

            push @pseudomerges, $cl;
            $cur = $ty->{Contributor};
            next;
            push @pseudomerges, $cl;
            $cur = $ty->{Contributor};
            next;