From 78e94f0e9f181d80a0688c731ee26e0e066790bc Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 4 Feb 2017 14:27:00 +0000 Subject: [PATCH] git-debrebase: WIP --- git-debrebase | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-debrebase b/git-debrebase index a00b4b55..ffe06e69 100755 --- a/git-debrebase +++ b/git-debrebase @@ -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; -- 2.30.2