X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=c25c18d9e91739b1f10dd392fac2ff93b135197b;hb=a23a044a9486d1aebdfaea9ff1c0ed2635339109;hp=a00b4b5589f95617c1a5b265453c832ebcaecaac;hpb=372dc1a02b45466d68ece5598c76e7749b56e1b2;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index a00b4b55..c25c18d9 100755
--- 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;