From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Merging CEDET Date: Mon, 04 Jun 2012 09:34:12 -0400 Message-ID: References: <87396ecfyr.fsf@gnu.org> <4FCB6B01.8020600@siege-engine.com> <87aa0kp962.fsf@engster.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1338816881 28617 80.91.229.3 (4 Jun 2012 13:34:41 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 4 Jun 2012 13:34:41 +0000 (UTC) Cc: "Eric M. Ludlam" , Chong Yidong , =?iso-8859-1?Q?Llu=EDs?= , emacs-devel@gnu.org To: "Eric M. Ludlam" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 04 15:34:38 2012 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 1SbXQZ-0003zt-J5 for ged-emacs-devel@m.gmane.org; Mon, 04 Jun 2012 15:34:35 +0200 Original-Received: from localhost ([::1]:57238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbXQZ-0006Yi-BD for ged-emacs-devel@m.gmane.org; Mon, 04 Jun 2012 09:34:35 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:39676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbXQS-0006YM-GI for emacs-devel@gnu.org; Mon, 04 Jun 2012 09:34:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbXQM-0008FC-Di for emacs-devel@gnu.org; Mon, 04 Jun 2012 09:34:28 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:50372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbXQG-0008Cv-7p; Mon, 04 Jun 2012 09:34:16 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EAG6Zu09sr+UI/2dsb2JhbABEtBGBCIIVAQEEAVYjBQsLNBIUGA0kiBwFugmQRAOjM4FYgwU X-IronPort-AV: E=Sophos;i="4.75,637,1330923600"; d="scan'208";a="188584703" Original-Received: from 108-175-229-8.dsl.teksavvy.com (HELO ceviche.home) ([108.175.229.8]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 04 Jun 2012 09:34:13 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id C05D6660E0; Mon, 4 Jun 2012 09:34:12 -0400 (EDT) In-Reply-To: <87aa0kp962.fsf@engster.org> (David Engster's message of "Sun, 03 Jun 2012 20:00:53 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 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:150767 Archived-At: > We use three branches: > - CEDET trunk (in the following: 'cedet') > - Emacs trunk (in the following: 'emacs'). Of course, we do not > care for the full Emacs trunk, but only for the CEDET-related > files (essentially: lisp/cedet and lisp/emacs-lisp/eieio*). > - a special branch inside of CEDET upstream (in the following: 'merge') Sounds OK. Note that I do not have a strong opinion on how things are done as long as the two are kept in sync reliably (ideally automatically, but most importantly without relying critically on a single person). Stefan