From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Barry Warsaw Newsgroups: gmane.emacs.devel Subject: Re: Messing with the VC history Date: Tue, 18 Nov 2014 11:47:47 -0500 Organization: Damn Crazy Followers of the Horn Message-ID: <20141118114747.242a35c7@anarchist.wooz.org> References: <87k32vsm8u.fsf@wanadoo.es> <83fvdjdv8t.fsf@gnu.org> <871tp3rv07.fsf@wanadoo.es> <87lhnavhz9.fsf@uwakimon.sk.tsukuba.ac.jp> <87ioiev7bp.fsf@uwakimon.sk.tsukuba.ac.jp> <85ppcl6knw.fsf@junk.nocrew.org> <878uj9uepz.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/ixSd3oJ.3QCmc6Bb3+YlzLX"; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1416329325 15837 80.91.229.3 (18 Nov 2014 16:48:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 18 Nov 2014 16:48:45 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 18 17:48:38 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XqlxC-0008IK-VW for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 17:48:35 +0100 Original-Received: from localhost ([::1]:54119 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqlxC-0004Aq-Kf for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 11:48:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xqlwn-00042F-M1 for emacs-devel@gnu.org; Tue, 18 Nov 2014 11:48:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xqlwf-0000kZ-PK for emacs-devel@gnu.org; Tue, 18 Nov 2014 11:48:09 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:50314) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xqlwf-0000kN-JI for emacs-devel@gnu.org; Tue, 18 Nov 2014 11:48:01 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xqlwd-000822-N3 for emacs-devel@gnu.org; Tue, 18 Nov 2014 17:47:59 +0100 Original-Received: from mail.wooz.org ([216.15.33.194]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 18 Nov 2014 17:47:59 +0100 Original-Received: from barry by mail.wooz.org with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 18 Nov 2014 17:47:59 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 47 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: mail.wooz.org X-Newsreader: Claws Mail 3.10.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177584 Archived-At: --Sig_/ixSd3oJ.3QCmc6Bb3+YlzLX Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Nov 18, 2014, at 04:53 PM, Stephen J. Turnbull wrote: >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. bisect would be more useful, IMHO, if it followed first-parents by default. IOW, when merging a feature branch into "mainline", I don't care whether intermediate commits on the feature branch don't pass all their tests. I *= do* care that every commit on "mainline" passes all their tests. >[1] However, some people think a mainline with only merge commits on >it is pretty, and they just oppose rebasing on principle. \o Cheers, -Barry --Sig_/ixSd3oJ.3QCmc6Bb3+YlzLX Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJUa3gzAAoJEBJutWOnSwa/VisP+gNV7ROBuJL0R8W16CUa/FzZ QTKws/RIgzQJF2mnmdhHOeaTX75zDgcG1SZwHboeUbx9s0WMoD9iyv1uzuUjGcG9 uR1v/zi62hfZWLV+Yftc9GCyLYREhuRdvho32bcZPJ74B1SelNityaqU46ZPsYwf VpNe/fczv5P+RnELcyyagsimLBA6I6hWCuwTH7KKcb1AuQql1cj0T0PePb5kwVMF rLEHL2dsvu3xFHstyMhJg1PldZpe1oa/sQRy2IgyQbsLRlZoo+md4XL1Wo+yV3uZ AidGMLdPqa34diMfil5wiRDdPIOTA7cWEnvxZ38mwxOJ/v27vu4aBKf17SIlL38t QAxYPqRJKu7X1C7Icsy53fyYMueEnWvLzd74SH42YLwoUlflNUmembNNLhCzJuPo FT8JEXJULEzbAUHsqW2BGnzTjsHIrjmvLP5MD6uXOwbT25T0JVQlGgayBn5uth0g jbAgSpP0n2oK8Eu2PfnbN+ZmWe+IcQ25De5snWXAUtGqs+iryYm3Kxj1HetY+Iu+ P/Qv13jvaPcGSx3IQDWlysyedzlHU9CIuNoicEU155+84xKgBpocJaZuGLSyr3aT VHrG5VZW4kBDGpFta8AGBTwPuT0CyzmzMLiVemDZdF7gE46ev1jDKHLXsBMfMuOM hO/q2e+dXbe77CMawWti =sSF4 -----END PGP SIGNATURE----- --Sig_/ixSd3oJ.3QCmc6Bb3+YlzLX--