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: git apologia Date: Tue, 18 Nov 2014 11:42:32 -0500 Organization: Damn Crazy Followers of the Horn Message-ID: <20141118114232.281fa009@anarchist.wooz.org> References: <20141114183737.GB3168@acm.acm> <5466517B.50705@porkrind.org> <20141114215404.GD3168@acm.acm> <838ujchods.fsf@gnu.org> <8761egx1k2.fsf@uwakimon.sk.tsukuba.ac.jp> <83sihkg2ds.fsf@gnu.org> <87vbmgv3b9.fsf@uwakimon.sk.tsukuba.ac.jp> <83389jdtae.fsf@gnu.org> <87k32uvg2x.fsf@uwakimon.sk.tsukuba.ac.jp> <83ioidbwz5.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/5EHHzb9YbASkQ3jU0rJLRAr"; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1416329002 10140 80.91.229.3 (18 Nov 2014 16:43:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 18 Nov 2014 16:43:22 +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:43:15 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 1Xqls2-0005sj-2T for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 17:43:14 +0100 Original-Received: from localhost ([::1]:54098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xqls1-0007K9-Nd for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 11:43:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xqlri-0007Af-Hd for emacs-devel@gnu.org; Tue, 18 Nov 2014 11:43:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xqlra-0007NV-Gt for emacs-devel@gnu.org; Tue, 18 Nov 2014 11:42:54 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:49721) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xqlra-0007NP-BM for emacs-devel@gnu.org; Tue, 18 Nov 2014 11:42:46 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XqlrZ-0005fZ-HS for emacs-devel@gnu.org; Tue, 18 Nov 2014 17:42:45 +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:42:45 +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:42:45 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 50 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:177582 Archived-At: --Sig_/5EHHzb9YbASkQ3jU0rJLRAr Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Nov 18, 2014, at 10:39 AM, Andreas Schwab wrote: >Eli Zaretskii writes: > >> What's more natural than asking for the Nth previous commit? > >In a DAG it's ambigous. I think it's more nuanced than that. Very often in practice commits happen linearly and in those cases, it's unambiguous. When merging in feature branches and such, then yes, technically the multiple parents results in ambiguity. Even so, a first-parent default would in practice usually give = you the answer you want. You can almost always ignore the details of the merge (of course, with command line overrides for when you need to delve deeper). Bazaar uses a first-parent default because it promotes a "main line of development" work flow, which is almost always what you (well, *I* :) want. Cheers, -Barry --Sig_/5EHHzb9YbASkQ3jU0rJLRAr Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJUa3b4AAoJEBJutWOnSwa/DSwP/3cfdRMr7dx+66pDrgPAidAd fU+D667gVY71ZEjuFHM0yp532KUVrBQ48fcRgWe3wewblJAwhPurC+IIV0D+Vnw4 jUfyrbt9/vRxhaiylZxOCptIOXXAE4V+crj3EiqFoPDX2CPnUYyQj+QfrP7bGI0H ESfQcwhcrQ1j+DEMbyEK39D2PDSry+WhGTL5ya5jNLOfHwEUiMDsSFPSBAo+vCwb q0bWHA5I0BSKDyFkdPAnSUhKdoDZZbgXZX8hXDajELhjIbNMvFTSCUHKBhJuA2UE zHt2GR5T2+jDkRlCcvJW7TEdwPJksO33rLPWaognOA7oobhc5ZpqFMgbk1D8NLu6 pbiG3KKJvccxyxtGSOxpg72BacDadA78CXvKq+ac1d4ZMVbC4PPqKZpEf+tTXrWD T/mWJgcCQ70w962uGGWc2FubQyBmVWhPAZxUtd1QrSFiMGvhUXTaCGyeL0spw6PM 34GMQfNZZAxkBbaMyymnQ/Da9kbduEIbhttV522BBT4w+8PMAO2ra7x3qAXxcLwp cjQSzfM4KvKYB573fJsVjRzANR9jEz2Tou3FmUVszO0prvj4rkFbJBAUrnBxv9Sl zGYdzqlzYvUXroyMj4K1LSLOzvM+K2slYtxHIQiRkORK23KBPPXpkUUWwDUJdJuJ qfbXpwjY2TNwooygjlTC =uXmk -----END PGP SIGNATURE----- --Sig_/5EHHzb9YbASkQ3jU0rJLRAr--