From: Sergey Organov <sorganov@gmail.com>
To: Christian Couder <christian.couder@gmail.com>
Cc: git <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>,
Jakub Narebski <jnareb@gmail.com>,
Markus Jansen <mja@jansen-preisler.de>,
Gabriel Alcaras <gabriel.alcaras@telecom-paristech.fr>,
Jeff King <peff@peff.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Jiang Xin <worldhello.net@gmail.com>,
Jacob Keller <jacob.keller@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Kaartic Sivaraam <kaartic.sivaraam@gmail.com>,
Igor Djordjevic <igor.d.djordjevic@gmail.com>,
Johannes Sixt <j6t@kdbg.org>,
Phillip Wood <phillip.wood@talktalk.net>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: Draft of Git Rev News edition 38
Date: Mon, 16 Apr 2018 15:29:02 +0300 [thread overview]
Message-ID: <87in8rz65t.fsf@javad.com> (raw)
In-Reply-To: <CAP8UFD1vFM8k-1Po=2QXZdBOuCca1Dg_FGaPnSi85hKp1je54w@mail.gmail.com> (Christian Couder's message of "Mon, 16 Apr 2018 10:55:12 +0200")
Hi Christian,
Christian Couder <christian.couder@gmail.com> writes:
> On Mon, Apr 16, 2018 at 12:11 AM, Christian Couder
> <christian.couder@gmail.com> wrote:
>>
>> A draft of a new Git Rev News edition is available here:
>>
>> https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-38.md
>
> The draft has just been updated with 2 articles contributed by Jake
> about rebasing merges, so I am cc'ing more people involved in those
> discussions.
I find this section of the draft pretty close to my own vision of what
and how has been discussed, except for a few issues.
[all quotations below are taken from the draft]
> Some discussion about --preserve-merges and compatibility with scripts
> (i.e. should we change or fix it? or should we deprecate it?)
> followed.
>
> Rebasing merges: a jorney to the ultimate solution (Road Clear)
> (written by Jacob Keller)
What article by Jacob is actually meant here I have no idea, please
check, as this one, and the RFC this refers to, was written by me, not
by Jacob, and it is the outline of potential method of actually rebasing
merges that is discussed in the next paragraph, so it likely belongs
right after the next paragraph:
> After the discussions in the above article Sergey posted an outline of a
> potential method for actually rebasing a merge (as opposed to recreating
> it from scratch) which used a process of git cherry-pick -mN of the
> merge onto each topic branch being merged, and then merging the result.
The reference to:
Rebasing merges: a jorney to the ultimate solution (Road Clear)
(written by Sergey Organov)
belongs here, if at all.
In addition, I'd like to see a minor edition to the following:
> Sergey replied that he thinks the solution produces the same result as
> his updated strategy.
This has been said in the context that assumed lack of conflicts during
application of both strategies. Something like this, maybe:
"Sergey replied that he thinks the solution produces the same result as
his updated strategy, at least when none of the strategies produce any
conflicts."
Next, this is very close, but not exactly right:
> Further suggestions to the strategy were proposed and tested, ultimately
> resulting in Sergey proposing the addition of using the original merge
> commit as a merge base during the final step.
This was not an addition, this was a fix of particular mistake in the
original RFC that has been revealed during testing. I didn't get it
right at first that it's original merge commit that must be used as
merge base, so my original proposal ended up implicitly using wrong
merge base, that is the one computed by "git merge-base U1' U2'".
Something along these lines may fit better:
"Further suggestions to the strategy were proposed and tested,
ultimately resulting in Sergey proposing the fix to his method,
specifically using the original merge commit as a merge base during the
final step."
I'd also like a reference to the final fixed [RFC v2] be added right
here. The reference is:
https://public-inbox.org/git/87r2oxe3o1.fsf@javad.com/
Thanks a lot!
-- Sergey
next prev parent reply other threads:[~2018-04-16 12:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-15 22:11 Draft of Git Rev News edition 38 Christian Couder
2018-04-16 8:55 ` Christian Couder
2018-04-16 12:29 ` Sergey Organov [this message]
2018-04-16 13:08 ` Christian Couder
2018-04-16 15:03 ` Sergey Organov
2018-04-16 15:07 ` Kaartic Sivaraam
2018-04-16 15:19 ` Sergey Organov
2018-04-16 22:30 ` Christian Couder
2018-04-17 0:58 ` Jacob Keller
2018-04-16 22:26 ` Christian Couder
2018-04-17 2:17 ` Kaartic Sivaraam
2018-04-17 7:33 ` Christian Couder
2018-04-16 15:52 ` Jacob Keller
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=87in8rz65t.fsf@javad.com \
--to=sorganov@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=christian.couder@gmail.com \
--cc=gabriel.alcaras@telecom-paristech.fr \
--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=jnareb@gmail.com \
--cc=kaartic.sivaraam@gmail.com \
--cc=mja@jansen-preisler.de \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
--cc=phillip.wood@talktalk.net \
--cc=sunshine@sunshineco.com \
--cc=worldhello.net@gmail.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public 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).