From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Magne Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: Incorrect merge Date: Thu, 04 Nov 2010 21:16:50 +0100 Organization: Programmerer Ingebrigtsen Message-ID: References: <4CCEC526.3070502@cornell.edu> <87aaltc9rc.fsf@stupidchicken.com> <83pqup53qb.fsf@gnu.org> <83fwvk6arf.fsf@gnu.org> <87hbg0jxyu.fsf@uwakimon.sk.tsukuba.ac.jp> <87d3qnk9am.fsf@telefonica.net> <87k4kvwu6w.fsf@uwakimon.sk.tsukuba.ac.jp> <8762wfk5r0.fsf@telefonica.net> <87eib3wp4j.fsf@uwakimon.sk.tsukuba.ac.jp> <87fwvjimg2.fsf@telefonica.net> <87d3qnwk0v.fsf@uwakimon.sk.tsukuba.ac.jp> <87wrovh2vl.fsf@telefonica.net> <871v73c775.fsf@uwakimon.sk.tsukuba.ac.jp> <87oca6hpld.fsf@telefonica.net> <87zktqj1fw.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1288902333 27688 80.91.229.12 (4 Nov 2010 20:25:33 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 4 Nov 2010 20:25:33 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 04 21:25:28 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PE6NB-0006lW-2Y for ged-emacs-devel@m.gmane.org; Thu, 04 Nov 2010 21:25:25 +0100 Original-Received: from localhost ([127.0.0.1]:52285 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PE6NA-0000Vm-AL for ged-emacs-devel@m.gmane.org; Thu, 04 Nov 2010 16:25:24 -0400 Original-Received: from [140.186.70.92] (port=49240 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PE6N3-0000UD-A0 for emacs-devel@gnu.org; Thu, 04 Nov 2010 16:25:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PE6Mu-00070i-JH for emacs-devel@gnu.org; Thu, 04 Nov 2010 16:25:17 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:41803) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PE6Mu-00070Y-8F for emacs-devel@gnu.org; Thu, 04 Nov 2010 16:25:08 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1PE6Mq-0006Zp-TS for emacs-devel@gnu.org; Thu, 04 Nov 2010 21:25:04 +0100 Original-Received: from cm-84.215.34.171.getinternet.no ([84.215.34.171]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 04 Nov 2010 21:25:04 +0100 Original-Received: from larsi by cm-84.215.34.171.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 04 Nov 2010 21:25:04 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 16 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.215.34.171.getinternet.no Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAMFBMVEWhVk/39e+LJSnDwr8y BA6fmJmpqbCsjH6Rk56oOiptExumcWb////+//5YCBYEAAGokRItAAAB60lEQVQ4jZ3SQUjbUBgH 8CA7WRiEwPAQhrhekoEjBLsynJb6QKzQIB49iSzksMFghyLdRWShoIdSBHkXD6Eg5NBmHVt0D5RS FA8vp8FOCYw6FD0ojJw89K0tG/W9pBf/t/DL/335yOM83vcxkyAIMNf6lN7uPXhvVCWt6gpu6n5q Wcfc/7e8LVOfOtA3cNMQDcMcAO6eGATeNBbS0zzP34N+xACnxt6JHgunxhI2nmyIJ59p+KlOrTZL 6qZ4tklDSxFet0qrJi8ssTN6S/hBf48I/MtDIaUPsnYf0qVBTAq2kIsczkHd0HAIoUxCcgUhLNFQ ll4QQsIYuCW9ZCMA633oREEjBGi9s2hYr9wSMNlv0F/1/rtG8pXqn0m2UWwAkm/XLJltFJ1LArIT UgWWaSig9nEYPpekCDh7x3e/d7v7MVBE6NHdzq9YcDo1Wyqvs+DAhBbeSF9eRho3448z15bCN5gF d7IZaCUtQZihAWmhDNryoiA8ZX5UnZxreftcUBkYmSWXcnvi2QeFgVEZXFVz9rjLMzNG7dqF1qlZ Lju8C3PaIrCO3BnTp8HKkP36QjL3im407OQ8uaheA5CjYQWhb9xXh+O4BA3DrmhKHXKp2QRDoKmL sXCKoPsxDlqFROFt/Ax12PAfGP8FFoMFXHfZu5EAAAAASUVORK5CYII= Mail-Copies-To: never X-Now-Playing: Don Cherry's _Orient_: "Orient" User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:4cmg8zhYDySym+FWahelt7PB1Zw= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:132373 Archived-At: Stefan Monnier writes: > (or once we get rid of the ChangeLog files) You probably hoped nobody would notice that parenthesis, but is getting rid of the ChangeLog files in the cards? 1) They're a pain in the ass, both to write and due to the constant merge conflicts. 2) But they give a better overview over what's happening, and who's doing what, than any VC log I've seen. -- (domestic pets only, the antidote for overdose, milk.) larsi@gnus.org * Lars Magne Ingebrigtsen