From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tassilo Horn Newsgroups: gmane.emacs.devel Subject: Re: [elpa] branch externals/auctex updated (8a181ee -> a54b985) Date: Sun, 02 Nov 2014 20:19:22 +0100 Message-ID: <87fve14dhh.fsf@thinkpad-t440p.tsdh.org> References: <20141101064856.5840.32625@vcs.savannah.gnu.org> <87bnorkp4m.fsf@thinkpad-t440p.tsdh.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1414955998 20232 80.91.229.3 (2 Nov 2014 19:19:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Nov 2014 19:19:58 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 02 20:19:52 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 1Xl0gp-0005VW-H8 for ged-emacs-devel@m.gmane.org; Sun, 02 Nov 2014 20:19:51 +0100 Original-Received: from localhost ([::1]:58994 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xl0gp-0002kh-4c for ged-emacs-devel@m.gmane.org; Sun, 02 Nov 2014 14:19:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xl0gY-0002iQ-HI for emacs-devel@gnu.org; Sun, 02 Nov 2014 14:19:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xl0gT-0008Fy-67 for emacs-devel@gnu.org; Sun, 02 Nov 2014 14:19:34 -0500 Original-Received: from out3-smtp.messagingengine.com ([66.111.4.27]:36062) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xl0gT-0008Ft-1l for emacs-devel@gnu.org; Sun, 02 Nov 2014 14:19:29 -0500 Original-Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id DD3D720A14 for ; Sun, 2 Nov 2014 14:19:28 -0500 (EST) Original-Received: from frontend1 ([10.202.2.160]) by compute3.internal (MEProxy); Sun, 02 Nov 2014 14:19:28 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=x-sasl-enc:from:to:cc:subject:references :date:in-reply-to:message-id:mime-version:content-type; s= smtpout; bh=mUODaX0XZVNOgnuyp7ZW0dgudGY=; b=ILYyjP/61OVWWjrj18FO c1qz0/T3XiRtgKmumhXE2MdtPKC79ltyUgyp9Z65gASZQ1imYPpw7TXO9O/y/gwV aboYMVDbNtdhxjRui9LbdkdF79pRPsuuR551eFoDdwKcDlaT+8e635/yoE4ncc0K 8nR/zYBRDe71BVkz66ZPNNs= X-Sasl-enc: gPcb7f2CQkacK/VWk+ElopDvO11+oA4rxRs1e/fbfk/G 1414955968 Original-Received: from thinkpad-t440p.tsdh.org (unknown [2.162.149.147]) by mail.messagingengine.com (Postfix) with ESMTPA id E1B0CC00008; Sun, 2 Nov 2014 14:19:27 -0500 (EST) Mail-Followup-To: Stefan Monnier , emacs-devel@gnu.org In-Reply-To: (Stefan Monnier's message of "Sat, 01 Nov 2014 21:11:42 -0400") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.111.4.27 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:176241 Archived-At: Stefan Monnier writes: >> And then I wanted to ask you if we could arrange it that ELPA auctex >> and main auctex (where we probably need to put some generated files >> under VCS that can't be generated on ELPA) are actually the very same >> thing. > > That would be great. Last time this was discussed it seemed that some > differences were difficult to remove (such as the auto-generated > files). I much prefer to have some generated files under version control if that makes merging easier. >> So from your reaction, it seems that this has already been the >> case... > > No, what we had before your commit is that the elpa.git code had the > metadata in order so that you could "git merge" from the upstream > AUCTeX code, with potentially some merge problems to solve since some > files have different names. > > I've just reverted your patch. Ok, and thanks for doing the merge! Bye, Tassilo