chiark / gitweb /
git-debrebase: WIP
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Feb 2017 14:27:00 +0000 (14:27 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
git-debrebase

index a00b4b5..ffe06e6 100755 (executable)
@@ -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;