From: Junio C Hamano <email@example.com> To: Phillip Wood <firstname.lastname@example.org> Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, Phillip Wood <email@example.com>, Git Mailing List <firstname.lastname@example.org> Subject: Re: [PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty Date: Thu, 22 Mar 2018 09:48:51 -0700 [thread overview] Message-ID: <email@example.com> (raw) In-Reply-To: <firstname.lastname@example.org> (Phillip Wood's message of "Thu, 22 Mar 2018 11:03:59 +0000") Phillip Wood <email@example.com> writes: > On 20/03/18 19:32, Junio C Hamano wrote: > >> With or without the above plan, what we saw from you were a bit >> messy to queue. The --keep-empty fix series is based on 'maint', >> while the --signoff series depends on changes that happened to >> sequencer between 'maint' and 'master', but yet depends on the >> former. > > Yes, that is awkward and unfortunate but the idea behind splitting them > into two separate series was to have a single set of bug fixes in the > history. The feature needed to be based on master, so if I'd had the bug > fixes in the same series you'd of had to cherry-pick them to maint which > would break branch/tag --contains. I'm not sure if that is a better option. I said "a bit messy" but that was a statement of a fact, not a complaint. Sometimes, we cannot avoid that necessary solutions to real-life problems must be messy. I still think what you sent was the best organization, given the constraints ;-). Thanks.
prev parent reply other threads:[~2018-03-22 16:48 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-20 10:11 Phillip Wood 2018-03-20 10:11 ` [PATCH 1/2] add failing test for rebase --recreate-merges --keep-empty Phillip Wood 2018-03-20 10:11 ` [PATCH 2/2] rebase --recreate-merges --keep-empty: don't prune empty commits Phillip Wood 2018-03-20 15:38 ` Johannes Schindelin 2018-03-20 15:42 ` [PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty Johannes Schindelin 2018-03-20 18:40 ` Phillip Wood 2018-03-20 19:32 ` Junio C Hamano 2018-03-22 11:03 ` Phillip Wood 2018-03-22 16:48 ` Junio C Hamano [this message]
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --firstname.lastname@example.org \ --email@example.com \ --cc=Johannes.Schindelin@gmx.de \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --subject='Re: [PATCH 0/2] rebase --recreate-merges --keep-empty: don'\''t prune empty' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).