From: "Stephen J. Turnbull" <stephen@xemacs.org>
To: Lars Brinkhoff <lars@nocrew.org>
Cc: emacs-devel@gnu.org
Subject: Re: Messing with the VC history
Date: Tue, 18 Nov 2014 16:53:28 +0900 [thread overview]
Message-ID: <878uj9uepz.fsf@uwakimon.sk.tsukuba.ac.jp> (raw)
In-Reply-To: <85ppcl6knw.fsf@junk.nocrew.org>
Lars Brinkhoff writes:
> Stephen J. Turnbull wrote:
> > John Yates wrote:
> > > Are they under the impression that by contrast a merge absolves
> > > them of any need to run tests?
> >
> > Of course not! They know for a fact that they already ran them on
> > the revisions in their feature branch and on the merged code, and
> > that the rebased revisions will be *different* from the revisions
> > they ran tests on. They object to running the tests *twice* when
> > once should do.
>
> I've met some of those. Is there a counterargument?
(I'm not sure what you're asking. HTH) It depends on the purpose of
the tests.
- If the purpose of the tests is to ensure that *released* code is
"clean", then you only need to test the merge version. No problem,
rebase and test when you feel like it. :-)
- If the purpose of the tests is to ensure that each revision in the
DAG is "clean" (eg, in order to make bisect as accurate as
possible), then it substantially reduces time and annoyance for the
the developer to test each change in the feature branch then *merge*
and test the merge commit. This case basically comes down to a
vote between the "pretty DAG" folks and the TDD crowd.[1]
- If the purpose of the tests is to ensure that each commit in the DAG
is "clean" in the context of the latest revision before yours, then
it makes sense to rebase and test each revision in the rebased
branch. You only do as much testing on the feature branch as gives
you confidence you won't have to do much debugging and repair for
rebased commits. In this case there is no conflict between rebasing
and thorough testing.
Personally, I'm kinda OCD and tend toward Type C most of the time.
(I've also read and understand the git documentation. You see my
problem, I think. :-) I find bisect very useful on occasion, so would
rule out Type A if at all possible. But I find Type B plausible, and
think it's a matter of taste.
Footnotes:
[1] However, some people think a mainline with only merge commits on
it is pretty, and they just oppose rebasing on principle.
next prev parent reply other threads:[~2014-11-18 7:53 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 [this message]
2014-11-18 8:41 ` David Kastrup
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=878uj9uepz.fsf@uwakimon.sk.tsukuba.ac.jp \
--to=stephen@xemacs.org \
--cc=emacs-devel@gnu.org \
--cc=lars@nocrew.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.