From: "Kévin Le Gouguec" <kevin.legouguec@gmail.com>
To: Teemu Likonen <tlikonen@iki.fi>
Cc: Lars Ingebrigtsen <larsi@gnus.org>,
eggert@cs.ucla.edu, emacs-devel@gnu.org,
Eli Zaretskii <eliz@gnu.org>,
rpluim@gmail.com
Subject: Re: Rebasing vs. merging
Date: Wed, 19 Aug 2020 11:49:39 +0200 [thread overview]
Message-ID: <87y2mb0xu4.fsf@gmail.com> (raw)
In-Reply-To: <87y2mbxal7.fsf@iki.fi> (Teemu Likonen's message of "Wed, 19 Aug 2020 12:13:08 +0300")
Teemu Likonen <tlikonen@iki.fi> writes:
> Another "philosophical" issue with rebasing is that the resulting code
> is not necessarily tested anymore. I mean:
>
> 1. Write new code based on upstream commit AAAA.
> 2. Test the new code: OK, it's working.
> 3. Want to push the code to the upstream.
> 4. Upstream branch has advanced to commit BBBB.
> 5. "git pull --rebase" so that the new code is now based on BBBB.
> 6. "git push" pushes untested code to the upstream.
How is the --rebase flag responsible for the ultimate issue (untested
code pushed upstream)? Step 6 could happen just as well with a merge
unless I'm missing something?
> So it can be seen: "My branch really worked, just 'git checkout'
> it and try, but it broke when I merged it with the upstream. Now let's
> find out why these two branches together cause trouble." Maybe this kind
> of recorded development history is useful in bug hunting too.
Focusing on merge commits may be a good heuristic to find *when*
(i.e. at which recorded point in the VC history) things broke, but it's
not a big help to find *why* IMO. No issue will show up on either
branch until the merge, so you're just left with an unintelligibly big
diff to make sense of.
When it comes to bug hunting, I find it more straightforward to bisect
on a linear history. Eventually I'll find which rebased commit is
responsible for the breakage, and it will be easier to find the issue in
this individual commit's diff.
I don't have a strong opinion on rebasing vs. merging, although FWIW I
do find merge commits noisy, and as explained above they make it less
straightforward (for me) to bisect.
next prev parent reply other threads:[~2020-08-19 9:49 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200816182558.16607.52991@vcs0.savannah.gnu.org>
[not found] ` <20200816182601.16F2A209AC@vcs0.savannah.gnu.org>
2020-08-16 18:34 ` master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs Lars Ingebrigtsen
2020-08-16 19:03 ` Eli Zaretskii
2020-08-16 19:13 ` Lars Ingebrigtsen
2020-08-17 14:15 ` Robert Pluim
2020-08-17 14:57 ` Stefan Monnier
2020-08-17 15:37 ` Robert Pluim
2020-08-17 16:58 ` Eli Zaretskii
2020-08-17 16:03 ` Andreas Schwab
2020-08-17 19:54 ` Stefan Monnier
2020-08-17 20:05 ` Andreas Schwab
2020-08-17 20:31 ` Stefan Monnier
2020-08-18 9:41 ` Yuri Khan
2020-08-18 16:48 ` Stefan Monnier
2020-08-18 18:47 ` Yuri Khan
2020-08-19 5:16 ` Madhu
2020-08-19 13:15 ` Stefan Monnier
2020-08-17 15:58 ` Eli Zaretskii
2020-08-17 16:11 ` Paul Eggert
2020-08-17 16:26 ` Lars Ingebrigtsen
2020-08-17 16:29 ` Paul Eggert
2020-08-17 17:01 ` Lars Ingebrigtsen
2020-08-17 17:08 ` Eli Zaretskii
2020-08-17 18:03 ` Lars Ingebrigtsen
2020-08-17 18:16 ` Eli Zaretskii
2020-08-17 18:43 ` Lars Ingebrigtsen
2020-08-17 19:28 ` Eli Zaretskii
2020-08-17 20:05 ` David De La Harpe Golden
2020-08-18 19:02 ` Basil L. Contovounesios
2020-08-19 3:56 ` Amin Bandali
2020-08-19 13:04 ` Stephen Leake
2020-08-19 9:13 ` Rebasing vs. merging Teemu Likonen
2020-08-19 9:49 ` Kévin Le Gouguec [this message]
2020-08-19 14:51 ` Eli Zaretskii
2020-08-19 16:09 ` Paul Eggert
2020-08-19 16:22 ` John Wiegley
2020-08-17 18:45 ` Rebasing vs merging (was: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs) Óscar Fuentes
2020-08-17 17:02 ` master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs Eli Zaretskii
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: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y2mb0xu4.fsf@gmail.com \
--to=kevin.legouguec@gmail.com \
--cc=eggert@cs.ucla.edu \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=larsi@gnus.org \
--cc=rpluim@gmail.com \
--cc=tlikonen@iki.fi \
/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://git.savannah.gnu.org/cgit/emacs.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).