From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Daniel Clemente Newsgroups: gmane.emacs.devel Subject: Re: CEDET sync Date: Sun, 06 Jun 2010 08:34:17 +0200 Message-ID: <87pr04k6ty.fsf@yahoo.com> 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=utf-8 Content-Transfer-Encoding: 8bit X-Trace: dough.gmane.org 1275806095 21541 80.91.229.12 (6 Jun 2010 06:34:55 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 6 Jun 2010 06:34:55 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jun 06 08:34:54 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 1OL9Rc-0003fI-K4 for ged-emacs-devel@m.gmane.org; Sun, 06 Jun 2010 08:34:52 +0200 Original-Received: from localhost ([127.0.0.1]:35595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OL9Rb-0000Qy-IY for ged-emacs-devel@m.gmane.org; Sun, 06 Jun 2010 02:34:51 -0400 Original-Received: from [140.186.70.92] (port=45600 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OL9RR-0000OJ-RA for emacs-devel@gnu.org; Sun, 06 Jun 2010 02:34:42 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OL9RP-00041m-Mu for emacs-devel@gnu.org; Sun, 06 Jun 2010 02:34:41 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:55908) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OL9RP-00041e-Gz for emacs-devel@gnu.org; Sun, 06 Jun 2010 02:34:39 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1OL9RK-0003Qh-6W for emacs-devel@gnu.org; Sun, 06 Jun 2010 08:34:34 +0200 Original-Received: from 89.6.42.98 ([89.6.42.98]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 06 Jun 2010 08:34:34 +0200 Original-Received: from dcl441-bugs by 89.6.42.98 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 06 Jun 2010 08:34:34 +0200 X-Injected-Via-Gmane: http://gmane.org/ connect(): No such file or directory Original-Lines: 18 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 89.6.42.98 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:YXQBctvkEcd47vv5yfjdMiJsAJE= 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:125555 Archived-At: > > My concern with such a scheme is how (*) to transplant changes from cedet into > an emacs subdirectory, such that all cedet commit logs and dates are maintained. > An easier setup: The CEDET branch (where CEDET programmers make most changes) is a branch of Emacs' trunk (done by: bzr branch http://bzr.savannah.gnu.org/r/emacs/trunk/ cedet). That means they don't work with „a directory which contains CEDET“, but with „a directory which contains the whole Emacs, including CEDET“. Obviously their changes will affect mostly the CEDET part and not the rest of Emacs. To bring changes by Emacs' trunk developers into the CEDET branch, use bzr pull (bzr merge if there were conflicts). It will be easy because both branches have a common ancestor. To push CEDET changes to Emacs' trunk, use bzr push. It will be as easy. You don't have to worry about putting things in the correct subdirectory because the file structure is the same in both branches. In order to package CEDET in a .tar.gz, care should be taken to select only the CEDET-related files and not the whole Emacs. This setup has the disadvantage of taking a little more space in disk for the CEDET branch (because you handle much more than CEDET), but other than that, it's very easy. Greetings, Daniel