From: Lluís <lluis@fulla.xlab.taz>
To: Daniel Clemente <dcl441-bugs@yahoo.com>
Cc: emacs-devel@gnu.org
Subject: Re: CEDET sync
Date: Sun, 06 Jun 2010 15:21:12 +0200 [thread overview]
Message-ID: <86bpboi9fb.wl%lluis@fulla.xlab.taz> (raw)
In-Reply-To: <87pr04k6ty.fsf@yahoo.com>
>>
>> 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
next prev parent reply other threads:[~2010-06-06 13:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-03 15:37 bug#6342: 23.2; error writing table of symbols with semantic in cedet Jonathan Marchand
2010-06-03 17:20 ` Chong Yidong
2010-06-04 13:07 ` CEDET sync Stefan Monnier
2010-06-04 18:47 ` Eric M. Ludlam
2010-06-04 19:53 ` Lluís
2010-06-04 20:53 ` Stefan Monnier
2010-06-06 6:34 ` Daniel Clemente
2010-06-06 13:21 ` Lluís [this message]
2012-03-15 22:03 ` bug#6342: 23.2; error writing table of symbols with semantic in cedet David Engster
2012-10-08 15:46 ` David Engster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86bpboi9fb.wl%lluis@fulla.xlab.taz \
--to=lluis@fulla.xlab.taz \
--cc=dcl441-bugs@yahoo.com \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.