From: Lluís <xscript@gmx.net>
To: "Eric M. Ludlam" <eric@siege-engine.com>
Cc: Stefan Monnier <monnier@iro.umontreal.ca>, emacs-devel@gnu.org
Subject: Re: CEDET sync
Date: Fri, 04 Jun 2010 21:53:14 +0200 [thread overview]
Message-ID: <86d3w660d1.wl%lluis@ginnungagap.pc.ac.upc.edu> (raw)
In-Reply-To: <4C094A28.6070008@siege-engine.com>
>>> Could you take a look at this report about a symbol that Semantic can't
>>> handle? I just applied your semantic-lex-spp-table-write-slot-value
>>> change that saves a nil instead of erroring on invalid values.
>>
>> BTW Eric, but it seems that Emacs's CEDET code and your own aren't being
>> sync'ed at all, is that right? If so, we really need to get this syncing
>> going ASAP, otherwise it will be hellish to maintain.
> If someone who knows some about dvcs systems I can use on Source Forge
> that would aid in such a sync system would like to help me set things
> up, that would be a huge boon for me!
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).
Right now I don't have much time to start playing with different VCS and
cross-merging strategies (I'm only proficient with subversion), but if any of
you come up with something that that would work with minimal user intervention
I'd be glad to start a new CEDET branch in such a scenario.
The first step I could do is renaming files, which is the major showstopper
right now. Then the real cross-merging could start, which I don't know if I
would have time to do.
As I understood it, the most viable cross-merging strategy would be:
emacs cedet
|- trunk |- trunk
\- <branchN> \- branch-emacs-<branchN>
Valid merging flows:
cedet::* <-> cedet::*
emacs::* <-> emacs::*
emacs::trunk/lisp/cedet <- cedet::emacs-trunk
emacs::<branchN>/lisp/cedet <- cedet::emacs-<branchN>
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.
(*) which VCS can be used and which restrictions might this impose on the
development workflow
Thanks,
Lluis
--
"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-04 19:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20100603153729.GD2763@loria.fr>
[not found] ` <87ocfsvxrl.fsf@stupidchicken.com>
2010-06-04 13:07 ` CEDET sync Stefan Monnier
2010-06-04 18:47 ` Eric M. Ludlam
2010-06-04 19:53 ` Lluís [this message]
2010-06-04 20:53 ` Stefan Monnier
2010-06-06 6:34 ` Daniel Clemente
2010-06-06 13:21 ` Lluís
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86d3w660d1.wl%lluis@ginnungagap.pc.ac.upc.edu \
--to=xscript@gmx.net \
--cc=emacs-devel@gnu.org \
--cc=eric@siege-engine.com \
--cc=monnier@iro.umontreal.ca \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).