From: Sergey Organov <sorganov@gmail.com> To: Johannes Schindelin <Johannes.Schindelin@gmx.de> Cc: Jacob Keller <jacob.keller@gmail.com>, Igor Djordjevic <igor.d.djordjevic@gmail.com>, Phillip Wood <phillip.wood@dunelm.org.uk>, Git Mailing List <git@vger.kernel.org>, Johannes Sixt <j6t@kdbg.org>, Junio C Hamano <gitster@pobox.com> Subject: Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear) Date: Fri, 30 Mar 2018 18:13:03 +0300 Message-ID: <87tvsxwq9s.fsf@javad.com> (raw) In-Reply-To: <nycvar.QRO.7.76.6.1803301523060.5026@qfpub.tvgsbejvaqbjf.bet> (Johannes Schindelin's message of "Fri, 30 Mar 2018 15:33:46 +0200 (DST)") Hi Johannes, Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: > Hi Sergey, > > On Fri, 30 Mar 2018, Sergey Organov wrote: > >> Could we please agree to stop using backward compatibility as an >> objection in the discussion of the --recreate-merges feature? > > No. > > The expectation of users as to what a `pick` is has not changed just > because you wish it would. As if I ever suggested to change user expectations. Could you please stop putting words into my mouth? I _am_ a user, and I expect 'pick' to pick commits, no matter how many parents they might have. And no, --preserve-merges did not ever pick commits with number of parents more than one, it rather threw them away and re-merged the heads. Calling it 'pick' was a huge mistake indeed! Fixing that mistake is what I expect, as a user. Just teach the 'pick' to correctly pick any commit, please! > > That is a matter of backwards-compatibility. OK, fine, at least its only about user expectations and not about some scripting incompatibility. > You see, if you are driving a car for a hundred years already, and then > switch to a different car, and it has a lever in the same place as your > previous car's windshield wiper, but in the new car it has a button that > activates the emergency driver seat ejection OMG *it has a seat ejection > like in the James Bond movies! Where can I get that car?* Sorry for > disgressing. Except it's irrelevant as the 'pick' will still pick commits. > I am really concerned about that willingness to put an innocuous button, > so to speak, onto something users got really used to, over the course of a > decade or so, when that button should really be made red and blinking and > OMG where can I get that car? It's irrelevant as the 'pick' will still pick commits. > So to reiterate, I am really interested in a practical solution that won't > cause nasty surprises. I rather don't see how it possibly could cause any surprises, especially compared to using 'merge' to pick commits. > Meaning: `pick` != merge. Exactly! Use 'merge' when you merge, as you are already doing. Use 'pick' when you are picking. You don't merge "merge commit" when you are picking it! > That was a mistake in preserve-merges, as I have only mentioned like a > hundred times, and we won't repeat it. The mistake was that it used 'pick' to denote re-merge. You already fixed that mistake by introducing 'merge' to re-merge, thanks God. Please don't commit yet another mistake by now using 'merge' to pick! -- Sergey
next prev parent reply other threads:[~2018-03-30 15:13 UTC|newest] Thread overview: 173+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-16 13:08 [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear) Sergey Organov 2018-02-18 4:16 ` Jacob Keller 2018-02-19 5:28 ` Sergey Organov 2018-02-19 23:44 ` Igor Djordjevic 2018-02-20 12:42 ` Sergey Organov 2018-02-27 0:07 ` Johannes Schindelin 2018-02-27 5:01 ` Sergey Organov 2018-02-27 5:30 ` Jacob Keller 2018-02-27 16:21 ` Johannes Schindelin 2018-02-27 18:55 ` Igor Djordjevic 2018-02-27 19:59 ` Igor Djordjevic 2018-02-27 23:27 ` Johannes Schindelin 2018-02-28 2:12 ` Igor Djordjevic 2018-02-28 4:35 ` Igor Djordjevic 2018-02-28 6:14 ` Sergey Organov 2018-02-28 20:53 ` Igor Djordjevic 2018-02-28 5:44 ` Sergey Organov 2018-02-28 19:42 ` Igor Djordjevic 2018-02-27 23:40 ` Igor Djordjevic 2018-02-28 0:10 ` Junio C Hamano 2018-02-28 2:35 ` Igor Djordjevic 2018-02-28 5:27 ` Sergey Organov 2018-02-28 0:36 ` Jacob Keller 2018-02-28 1:33 ` Igor Djordjevic 2018-02-28 1:43 ` Igor Djordjevic 2018-02-28 5:21 ` Sergey Organov 2018-02-28 19:09 ` Igor Djordjevic 2018-03-01 5:27 ` Sergey Organov 2018-02-28 5:19 ` Sergey Organov 2018-02-28 20:25 ` Igor Djordjevic 2018-02-28 22:17 ` Igor Djordjevic 2018-03-01 5:19 ` Sergey Organov 2018-03-01 5:39 ` Sergey Organov 2018-03-02 1:16 ` Igor Djordjevic 2018-03-02 5:40 ` Sergey Organov 2018-03-02 17:45 ` Igor Djordjevic 2018-03-02 11:17 ` [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear) Phillip Wood 2018-03-02 12:36 ` Phillip Wood 2018-03-02 16:02 ` Jacob Keller 2018-03-02 23:33 ` Igor Djordjevic 2018-03-06 10:36 ` Phillip Wood 2018-03-06 18:12 ` Johannes Schindelin 2018-03-06 19:43 ` Igor Djordjevic 2018-03-07 7:26 ` Johannes Schindelin 2018-03-08 11:20 ` Phillip Wood 2018-03-08 12:16 ` Phillip Wood 2018-03-08 16:05 ` Igor Djordjevic 2018-03-11 12:00 ` Johannes Schindelin 2018-03-11 16:33 ` Igor Djordjevic 2018-03-12 10:37 ` Johannes Schindelin 2018-03-12 12:56 ` Sergey Organov 2018-03-13 0:01 ` Igor Djordjevic 2018-03-26 12:03 ` Johannes Schindelin 2018-03-27 5:08 ` Sergey Organov 2018-03-27 13:35 ` Johannes Schindelin 2018-04-02 6:07 ` Sergey Organov 2018-03-12 23:54 ` Igor Djordjevic 2018-03-13 6:25 ` Sergey Organov 2018-03-08 15:56 ` Igor Djordjevic 2018-03-11 12:08 ` Johannes Schindelin 2018-03-11 17:34 ` Igor Djordjevic 2018-03-12 10:46 ` Johannes Schindelin 2018-03-13 0:16 ` Igor Djordjevic 2018-03-26 13:07 ` Johannes Schindelin 2018-03-27 5:51 ` Sergey Organov 2018-03-27 13:49 ` Johannes Schindelin 2018-03-28 5:57 ` Sergey Organov 2018-03-30 13:41 ` Johannes Schindelin 2018-03-30 16:36 ` Sergey Organov 2018-03-28 5:57 ` Sergey Organov [not found] ` <CA+P7+xoDQ2mzhxeZPFhaY+TaSoKkQm=5AtoduHH06-VggOJ2jg@mail.gmail.com> 2018-03-28 11:29 ` Sergey Organov [not found] ` <CA+P7+xo19mHrWz9Fy-ifgCcVJM2xwzcLj7F2NvFe2LwGbaJiDQ@mail.gmail.com> 2018-03-29 5:53 ` Sergey Organov 2018-03-30 10:38 ` Johannes Schindelin 2018-03-30 12:36 ` Sergey Organov 2018-03-30 13:33 ` Johannes Schindelin 2018-03-30 15:13 ` Sergey Organov [this message] 2018-03-28 12:10 ` Sergey Organov 2018-03-08 16:07 ` Jacob Keller 2018-03-11 12:11 ` Johannes Schindelin 2018-03-11 17:46 ` Igor Djordjevic 2018-03-08 15:16 ` Igor Djordjevic 2018-03-08 16:21 ` Igor Djordjevic 2018-03-11 12:22 ` Johannes Schindelin 2018-03-14 14:24 ` Sergey Organov 2018-03-14 23:11 ` Igor Djordjevic 2018-03-15 6:00 ` Sergey Organov 2018-03-15 21:51 ` Igor Djordjevic 2018-03-17 2:08 ` Igor Djordjevic 2018-03-19 5:44 ` Sergey Organov 2018-03-19 21:35 ` Igor Djordjevic 2018-03-20 14:43 ` Sergey Organov 2018-03-26 13:47 ` Johannes Schindelin 2018-03-06 23:24 ` Junio C Hamano 2018-03-07 7:09 ` Johannes Schindelin 2018-03-07 18:20 ` Junio C Hamano 2018-03-08 7:03 ` Johannes Schindelin 2018-03-08 8:11 ` Junio C Hamano 2018-03-09 17:09 ` Johannes Schindelin 2018-03-02 16:00 ` Jacob Keller 2018-03-02 18:14 ` Igor Djordjevic 2018-03-03 17:29 ` Igor Djordjevic 2018-03-05 5:35 ` Sergey Organov 2018-03-02 11:31 ` [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear) Phillip Wood 2018-03-03 0:29 ` Igor Djordjevic 2018-03-05 5:00 ` Sergey Organov 2018-03-06 10:52 ` Phillip Wood 2018-03-06 16:56 ` Junio C Hamano 2018-03-08 7:05 ` Johannes Schindelin 2018-03-08 8:18 ` Junio C Hamano 2018-03-11 11:56 ` Johannes Schindelin 2018-03-13 18:24 ` Junio C Hamano 2018-03-26 13:17 ` Johannes Schindelin 2018-03-05 17:29 ` Johannes Schindelin 2018-03-06 23:21 ` Igor Djordjevic 2018-03-07 7:04 ` Johannes Schindelin 2018-03-06 10:45 ` Phillip Wood 2018-03-06 11:45 ` Sergey Organov 2018-03-08 16:30 ` Igor Djordjevic 2018-03-06 18:12 ` Johannes Schindelin 2018-03-07 5:08 ` Sergey Organov 2018-03-07 6:58 ` Johannes Schindelin 2018-03-07 14:34 ` Sergey Organov 2018-03-08 6:45 ` Johannes Schindelin 2018-03-12 12:31 ` Sergey Organov 2018-03-26 11:37 ` Johannes Schindelin 2018-03-27 5:11 ` Sergey Organov 2018-03-27 12:55 ` Johannes Schindelin 2018-03-28 4:32 ` Sergey Organov 2018-03-08 11:08 ` Phillip Wood 2018-03-05 17:52 ` Johannes Schindelin 2018-03-13 16:10 ` Sergey Organov 2018-03-14 1:12 ` Igor Djordjevic 2018-03-14 7:21 ` Sergey Organov 2018-03-15 0:09 ` Igor Djordjevic 2018-03-15 7:52 ` Sergey Organov 2018-03-15 23:08 ` Igor Djordjevic 2018-03-16 7:31 ` Sergey Organov 2018-03-17 3:04 ` Igor Djordjevic 2018-03-19 6:01 ` Sergey Organov 2018-03-26 14:11 ` Johannes Schindelin 2018-02-28 0:29 ` Jacob Keller 2018-02-27 11:57 ` Sergey Organov 2018-02-27 18:14 ` Junio C Hamano 2018-02-28 0:30 ` Jacob Keller 2018-02-28 5:54 ` Sergey Organov 2018-02-28 4:53 ` Sergey Organov 2018-03-06 13:26 ` [RFC v2] " Sergey Organov 2018-03-07 6:46 ` Johannes Schindelin 2018-03-07 13:27 ` Sergey Organov 2018-03-07 14:08 ` Johannes Schindelin 2018-03-07 15:16 ` Sergey Organov 2018-03-08 7:01 ` Johannes Schindelin 2018-03-12 12:42 ` Sergey Organov 2018-03-26 11:50 ` Johannes Schindelin 2018-03-08 19:58 ` Igor Djordjevic 2018-03-08 20:27 ` Igor Djordjevic 2018-03-08 22:05 ` Igor Djordjevic 2018-03-08 23:31 ` Igor Djordjevic 2018-03-11 15:47 ` Johannes Schindelin 2018-03-11 20:53 ` Igor Djordjevic 2018-03-12 10:20 ` Johannes Schindelin 2018-03-12 13:49 ` Sergey Organov 2018-03-26 12:44 ` Johannes Schindelin 2018-03-27 5:32 ` Sergey Organov 2018-03-13 0:29 ` Igor Djordjevic 2018-03-26 13:58 ` Johannes Schindelin 2018-03-12 13:07 ` Sergey Organov 2018-03-11 15:40 ` Johannes Schindelin 2018-03-11 22:04 ` Igor Djordjevic 2018-03-12 12:05 ` Sergey Organov 2018-03-26 11:33 ` Johannes Schindelin 2018-03-27 5:34 ` Sergey Organov 2018-03-12 22:41 ` Igor Djordjevic
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 \ --in-reply-to=87tvsxwq9s.fsf@javad.com \ --to=sorganov@gmail.com \ --cc=Johannes.Schindelin@gmx.de \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=igor.d.djordjevic@gmail.com \ --cc=j6t@kdbg.org \ --cc=jacob.keller@gmail.com \ --cc=phillip.wood@dunelm.org.uk \ /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
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git