Hi Phillip,
On Tue, 20 Mar 2018, Phillip Wood wrote:
> From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx>
>
> If there are empty commits on the left hand side of $upstream...HEAD
> then the empty commits on the right hand side that we want to keep are
> pruned because they are marked as cherry-picks. Fix this by keeping
> the commits that are empty or are not marked as cherry-picks.
Thank you!
> @@ -3172,12 +3173,9 @@ int sequencer_make_script(FILE *out, int argc, const char **argv,
>
> init_revisions(&revs, NULL);
> revs.verbose_header = 1;
> - if (recreate_merges)
> - revs.cherry_mark = 1;
> - else {
> + if (!recreate_merges)
> revs.max_parents = 1;
> - revs.cherry_pick = 1;
> - }
> + revs.cherry_mark = 1;
> revs.limited = 1;
> revs.reverse = 1;
> revs.right_only = 1;
Yeah, this looks ugly. I'd rather have your patch series applied first and
then rebase my --recreate-merges patch series on top.
Ciao,
Dscho
