From: David Kastrup <dak@gnu.org>
To: emacs-devel@gnu.org
Subject: Re: Messing with the VC history
Date: Tue, 18 Nov 2014 09:41:19 +0100 [thread overview]
Message-ID: <87ioicj3yo.fsf@fencepost.gnu.org> (raw)
In-Reply-To: 878uj9uepz.fsf@uwakimon.sk.tsukuba.ac.jp
"Stephen J. Turnbull" <stephen@xemacs.org> writes:
> [1] However, some people think a mainline with only merge commits on
> it is pretty, and they just oppose rebasing on principle.
"Beauty" as an underlying concept of "pretty" usually involves
perfection, and perfection in technical settings implies everything
having a purpose. A merge commit is a branch that starts off somewhere
and ends somewhere. If there is no point to where the branch starts
off, the branch start is ugly, never mind whether you consider a merge
in itself pretty.
An example for a merge commit in a pretty-based development environment
would be
<URL:https://code.google.com/p/lilypond/issues/detail?id=4097#c14>. A
merge commit is used because not all intermediate states in the
logically separate commits may be compilable (either they are known to
be uncompilable, or the jury is out on them).
Even through the commit sequence itself has been "prettified" by
structuring it into separate commits doing one logical task, a merge
commit is warranted in order not to cause bisection problems. The
starting point of the branching point is not arbitrary: it is the parent
of the merge commit. Such an incestuous merge has to be ordered
explicitly using the --no-ff flag to merge.
--
David Kastrup
next prev parent reply other threads:[~2014-11-18 8:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-16 6:17 Messing with the VC history Óscar Fuentes
2014-11-16 8:19 ` Achim Gratz
2014-11-16 15:25 ` Eli Zaretskii
2014-11-16 16:00 ` David Engster
2014-11-17 16:48 ` Eli Zaretskii
2014-11-16 16:33 ` Achim Gratz
2014-11-16 18:13 ` Eli Zaretskii
2014-11-22 10:04 ` Steinar Bang
2014-11-16 15:24 ` Eli Zaretskii
2014-11-16 16:05 ` Óscar Fuentes
2014-11-16 16:21 ` Eli Zaretskii
2014-11-16 23:33 ` Stephen J. Turnbull
2014-11-17 1:31 ` John Yates
2014-11-17 3:23 ` Stephen J. Turnbull
2014-11-18 7:18 ` Lars Brinkhoff
2014-11-18 7:42 ` David Kastrup
2014-11-18 7:53 ` Stephen J. Turnbull
2014-11-18 8:41 ` David Kastrup [this message]
2014-11-18 16:47 ` Barry Warsaw
2014-11-18 17:06 ` Andreas Schwab
2014-11-18 22:30 ` Stephen J. Turnbull
2014-11-19 2:34 ` Stefan Monnier
2014-11-17 16:42 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ioicj3yo.fsf@fencepost.gnu.org \
--to=dak@gnu.org \
--cc=emacs-devel@gnu.org \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.