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: CEDET sync Date: Fri, 04 Jun 2010 16:53:25 -0400 Message-ID: References: <20100603153729.GD2763@loria.fr> <87ocfsvxrl.fsf@stupidchicken.com> <4C094A28.6070008@siege-engine.com> <86d3w660d1.wl%lluis@ginnungagap.pc.ac.upc.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1275684822 19685 80.91.229.12 (4 Jun 2010 20:53:42 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 4 Jun 2010 20:53:42 +0000 (UTC) Cc: emacs-devel@gnu.org, "Eric M. Ludlam" To: =?iso-8859-1?Q?Llu=EDs?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jun 04 22:53:40 2010 connect(): No such file or directory 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 1OKdtW-000181-I7 for ged-emacs-devel@m.gmane.org; Fri, 04 Jun 2010 22:53:35 +0200 Original-Received: from localhost ([127.0.0.1]:42040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKdtV-00029n-Oz for ged-emacs-devel@m.gmane.org; Fri, 04 Jun 2010 16:53:33 -0400 Original-Received: from [140.186.70.92] (port=39529 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKdtQ-00029J-As for emacs-devel@gnu.org; Fri, 04 Jun 2010 16:53:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKdtO-0004fS-Pr for emacs-devel@gnu.org; Fri, 04 Jun 2010 16:53:27 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:52544 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKdtO-0004fL-Lx for emacs-devel@gnu.org; Fri, 04 Jun 2010 16:53:26 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAE4ECUzO+K4b/2dsb2JhbACeQ3K/GYUXBIxf X-IronPort-AV: E=Sophos;i="4.53,363,1272859200"; d="scan'208";a="67327412" Original-Received: from 206-248-174-27.dsl.teksavvy.com (HELO pastel.home) ([206.248.174.27]) by ironport2-out.pppoe.ca with ESMTP; 04 Jun 2010 16:53:25 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 8045B81F8; Fri, 4 Jun 2010 16:53:25 -0400 (EDT) In-Reply-To: <86d3w660d1.wl%lluis@ginnungagap.pc.ac.upc.edu> (=?iso-8859-1?Q?=22Llu=EDs=22's?= message of "Fri, 04 Jun 2010 21:53:14 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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:125529 Archived-At: > Problem is, I didn't see a clear and hassle-free path to do > cross-project merging in the long term (I didn't ask the GNUS people > about their strategy). I don't know of any good answer either. Maybe the best option is to make the upstream repository "track" the Emacs repository; any change made in Emacs can be trivially merged back into upstream. Then every once in a while, someone syncs up the upstream with the Emacs code (mainly overwriting the Emacs code with the upstream code, but being careful to avoid race conditions where someone commits to the Emacs repository between the last merge and the actual overwrite). Stefan