From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?UTF-8?B?TGx1w61z?= Newsgroups: gmane.emacs.devel Subject: Re: CEDET sync Date: Sun, 06 Jun 2010 15:21:12 +0200 Message-ID: <86bpboi9fb.wl%lluis@fulla.xlab.taz> References: <20100603153729.GD2763@loria.fr> <87ocfsvxrl.fsf@stupidchicken.com> <4C094A28.6070008@siege-engine.com> <86d3w660d1.wl%lluis@ginnungagap.pc.ac.upc.edu> <87pr04k6ty.fsf@yahoo.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Trace: dough.gmane.org 1275830489 31438 80.91.229.12 (6 Jun 2010 13:21:29 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 6 Jun 2010 13:21:29 +0000 (UTC) Cc: emacs-devel@gnu.org To: Daniel Clemente Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jun 06 15:21:28 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 1OLFn5-0003pD-Gq for ged-emacs-devel@m.gmane.org; Sun, 06 Jun 2010 15:21:27 +0200 Original-Received: from localhost ([127.0.0.1]:52727 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OLFn4-00039g-OM for ged-emacs-devel@m.gmane.org; Sun, 06 Jun 2010 09:21:26 -0400 Original-Received: from [140.186.70.92] (port=58250 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OLFmx-00036J-9N for emacs-devel@gnu.org; Sun, 06 Jun 2010 09:21:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OLFmw-00073B-76 for emacs-devel@gnu.org; Sun, 06 Jun 2010 09:21:19 -0400 Original-Received: from mail.gmx.net ([213.165.64.20]:37497) by eggs.gnu.org with smtp (Exim 4.69) (envelope-from ) id 1OLFmv-00072n-Qa for emacs-devel@gnu.org; Sun, 06 Jun 2010 09:21:18 -0400 Original-Received: (qmail invoked by alias); 06 Jun 2010 13:21:13 -0000 Original-Received: from 142.pool62-37-86.dynamic.orange.es (EHLO localhost) [62.37.86.142] by mail.gmx.net (mp055) with SMTP; 06 Jun 2010 15:21:13 +0200 X-Authenticated: #12333383 X-Provags-ID: V01U2FsdGVkX191L2IG/HF196Mky2p0NYtuMgj8PWVSAL8m4Ge14I HWbhO+q2CaVMVP lFrom: =?UTF-8?B?TGx1w61z?= In-Reply-To: <87pr04k6ty.fsf@yahoo.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/24.0.50 (i486-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) X-Y-GMX-Trusted: 0 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:125557 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). [...] > 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. This takes a whole lot more space to have local copies, and in the case of bzr this translates into much slower operations. Besides, there's people using other emacs' flavours. What we ought to know is how to easily transplant changes and commit information. In order to make such merges look good in the log history (e.g., "merge from cedet trunk"; such that not all cedet individual commit messages are visible in the "top-level" commit messages), the cedet -> emacs merge should be something like: * create new branch in emacs for the sole purpose of the merge * transplant changes maintaining author, log and date information * record in a file which revisions have been merged and/or discarded for merge (those not recorded will be candidate for merge in posterior runs of the script) * merge this branch wherever it fits * delete branch I'm sure a simple script could be written to perform points 2 and 3 for each revision, and another to show a log only with the revisions not listed in the aforementioned file. apa! -- "And it's much the same thing with knowledge, for whenever you learn something new, the whole world becomes that much richer." -- The Princess of Pure Reason, as told by Norton Juster in The Phantom Tollbooth