From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steve Youngs Newsgroups: gmane.emacs.devel Subject: Re: Abolishing ChangeLog files Date: Sat, 30 Mar 2013 09:06:32 +1000 Organization: The SXEmacs Project Message-ID: References: <87y5d9p5td.fsf@dex.adm.naquadah.org> <87vc8dtbcb.fsf@lifelogs.com> <871ub1gmdf.fsf@engster.org> <87d2ulovd0.fsf@dex.adm.naquadah.org> <85r4j0h1ww.fsf@member.fsf.org> <85li98h1qx.fsf@member.fsf.org> <87ehf0b3x2.fsf@uwakimon.sk.tsukuba.ac.jp> <87obe3gaem.fsf@engster.org> <87ip4bj1ay.fsf_-_@earth.home> <87a9pnhjya.fsf@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1364598418 12717 80.91.229.3 (29 Mar 2013 23:06:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 29 Mar 2013 23:06:58 +0000 (UTC) Keywords: git,steve,conflicts To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 30 00:07:25 2013 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 1ULiOI-0007ry-1U for ged-emacs-devel@m.gmane.org; Sat, 30 Mar 2013 00:07:22 +0100 Original-Received: from localhost ([::1]:36029 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULiNt-0008Ds-Ki for ged-emacs-devel@m.gmane.org; Fri, 29 Mar 2013 19:06:57 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:59202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULiNp-0008Df-Dt for emacs-devel@gnu.org; Fri, 29 Mar 2013 19:06:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULiNn-0004lQ-IB for emacs-devel@gnu.org; Fri, 29 Mar 2013 19:06:53 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:49725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULiNn-0004lA-8O for emacs-devel@gnu.org; Fri, 29 Mar 2013 19:06:51 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1ULiO7-0007Nk-DS for emacs-devel@gnu.org; Sat, 30 Mar 2013 00:07:11 +0100 Original-Received: from 124-148-51-93.dyn.iinet.net.au ([124.148.51.93]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 30 Mar 2013 00:07:11 +0100 Original-Received: from steve by 124-148-51-93.dyn.iinet.net.au with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 30 Mar 2013 00:07:11 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 21 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 124-148-51-93.dyn.iinet.net.au X-Face: #O)>9erkUv7RJ~0G~5_6lEMz\HC2&~&kV2bsu4TWHI_v~<8Hj%KBBj1[*\uKF*dxbEzwAli ; tSuN`c)F,}p|7{6lA~e.P+7Qo\A%q"lJ7/UtUX@yEZ!X"Tph(3O8`nhPJF>hI4_GOvb%X{+e*Mi_| ^yTf#aTwGG,(3e41?C9B7Pak*'A$+$/hV Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAGFBMVEXv6ecWEgjv68+2rY0e ER9SSFL8/8ZDOCFcC6+iAAACZklEQVQ4jW2UQZPaMAyFM2xLz5rxjq8MbNMrkJo9e6qMrw2O6iuT nU3PaazR368CZGG7NYSDvshPkp8p+o/rVKyWffEfsHZV+RF0/aYB+PMPOPWntZNsict3YEMVDbXG Hb0DGxEMIExc0fYObAYRD5ZIiOjwBoqHxnrwxrrmx0hx+QYWjWmMzxAEONH2qlF23Q45ezTIdRNS nPvo+peG2BsIo4vPwse3zrvUxsEYkOgiK+jnjM/OWEMZMRKxoziDdbUDA2PrUZi3xSAzeEiAg0Ft w+RhtfA0i7udbt9mISMSVju7V7CcmostYI4kubFMztKhn4G3NUkr4ydTO+DYXzUenAmOKdXbBQQO dFxeNb4+4aPOLmyL4inUREV5zdh/N5lTHasqOhuS+bm4gK4yHiCD/ugSARO7CyCP3iMM5gx0+HC4 ADGIHtDoFK0izTxeAYKGNQsQwSCZZpzAqWj15KYkfXDIIeNwBpsq+YuuxkWIW4RRT7AjvISnZYRc JLCT+AslzuYS1zcsxYrOFn2VLKqcw2SeKSfqbKcGfyMn1dV41qo8cyr7CxBVy6i16D4ZMMWLz/pX m1rDhrQWbd9DLGegjgxqyykD0T6u+xkknbg6WRV8sLKfLasaxCRawNShjW9e7r8lUftzPrc+9jfg kqSMJFMP4XAHnpOgtJTUU8O4vANJsn6JtAs7ljfQPWNLiFQPnvPjrxsov6i2r5MeR3bpTvz0lMJ0 Y/Tk2DV3YJG0phxqHQgTxTsNPcjQ2qFlSUzHG9joFYOAel90Mry/gRdizvqZ9qlucRUvFpuq2lf6 rIq7v4O/I35gkm7rhewAAAAASUVORK5CYII= Mail-Copies-To: never X-URL: X-Shop: X-Request-PGP: X-OpenPGP-Fingerprint: 1659 2093 19D5 C06E D320 3A20 1D27 DB4B A94B 3003 X-Now-Playing: Walking On A Dream --- [Empire Of The Sun] X-Git-WebSite-Repo: X-Git-Repo: X-Discordian-Date: Prickle-Prickle, the 16th day of Discord, 3179. X-Attribution: SY User-Agent: Gnus/5.130006 (Ma Gnus v0.6) SXEmacs/22.1.15 (Goggomobil, linux) Cancel-Lock: sha1:InNEu5Vy4zhEQwPaAkT4mxeDUhM= 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:158452 Archived-At: * John Wiegley writes: >>>>>> Steve Youngs writes: >> Your method does nothing to alleviate the problem of recurring conflicts on >> the ChangeLog files. Because of their very nature and purpose the ChangeLog >> files get the most conflicts. Normally very easy to resolve, but still, a >> PITA. > Steve, Git does support "drivers" for its merge algorithm, for specialized > data types that might otherwise be prone to constant conflicts. See: > http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c Wow, there is just so much more to Git than meets the eye. I had no idea about this, thanks for showing me, John. -- |---------------------| | SXEmacs - The only _______ you'll ever need. | | Fill in the blank, yes, it's THAT good! | |---------------------------------------|