From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: Having a custom merge process Date: Sat, 26 Dec 2015 00:40:24 +0100 Message-ID: <87poxunllj.fsf@gnus.org> References: <8337urm0cv.fsf@gnu.org> <83ziwzkl50.fsf@gnu.org> <87lh8jvsqh.fsf@fencepost.gnu.org> <83si2qliho.fsf@gnu.org> <83d1tulaa1.fsf@gnu.org> <838u4il3jf.fsf@gnu.org> <83y4cijo24.fsf@gnu.org> <83twn6jm7e.fsf@gnu.org> <87twn686cn.fsf@isaac.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1451086866 5079 80.91.229.3 (25 Dec 2015 23:41:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 25 Dec 2015 23:41:06 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 26 00:40:57 2015 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 1aCbyj-0006ED-F9 for ged-emacs-devel@m.gmane.org; Sat, 26 Dec 2015 00:40:57 +0100 Original-Received: from localhost ([::1]:36874 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCbyi-0005Ez-Ol for ged-emacs-devel@m.gmane.org; Fri, 25 Dec 2015 18:40:56 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCbyf-0005Ei-6V for emacs-devel@gnu.org; Fri, 25 Dec 2015 18:40:53 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aCbya-0008Cc-6O for emacs-devel@gnu.org; Fri, 25 Dec 2015 18:40:53 -0500 Original-Received: from hermes.netfonds.no ([80.91.224.195]:46615) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCbyZ-0008CW-Vf for emacs-devel@gnu.org; Fri, 25 Dec 2015 18:40:48 -0500 Original-Received: from 2.150.58.24.tmi.telenormobil.no ([2.150.58.24] helo=mouse) by hermes.netfonds.no with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1aCbyE-0006xi-0w for emacs-devel@gnu.org; Sat, 26 Dec 2015 00:40:26 +0100 In-Reply-To: (John Wiegley's message of "Fri, 25 Dec 2015 15:35:30 -0800") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.1.50 (gnu/linux) X-MailScanner-ID: 1aCbyE-0006xi-0w MailScanner-NULL-Check: 1451691626.24333@aWAh+1ZAPAx8w0qvdOu/Qw X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.224.195 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:196872 Archived-At: John Wiegley writes: > I've used Git in many scenarios, on many projects, but some of the practices > we're using here for Emacs development I've never seen before. This simply > makes me wonder how much of that difference is truly necessary, or is a result > of having evolved to this point from CVS and then Bazaar. I think the latter is probably true. There are many people here who aren't that fond of git. (I'm one of them. :-)) And that's probably somewhat unusual, these days. But as I see it, other projects just accept gits many, many peculiarities and live with them, but in the Emacs toolchain we've (I mean, not me; I had nothing to do with it) tried to create a layer of sanity and reliability over the gittishness... Hey! It's time for a new 500+ article VC thread! -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no