unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: "Eric M. Ludlam" <ericludlam@gmail.com>
Cc: "Eric M. Ludlam" <zappo@gnu.org>, "Chong Yidong" <cyd@gnu.org>,
	Lluís <xscript@gmx.net>,
	emacs-devel@gnu.org
Subject: Re: Merging CEDET
Date: Mon, 04 Jun 2012 09:34:12 -0400	[thread overview]
Message-ID: <jwv8vg3td98.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87aa0kp962.fsf@engster.org> (David Engster's message of "Sun, 03 Jun 2012 20:00:53 +0200")

>   We use three branches:

>     - CEDET trunk (in the following: 'cedet')
>     - Emacs trunk (in the following: 'emacs'). Of course, we do not
>       care for the full Emacs trunk, but only for the CEDET-related
>       files (essentially: lisp/cedet and lisp/emacs-lisp/eieio*).
>     - a special branch inside of CEDET upstream (in the following: 'merge')

Sounds OK.  Note that I do not have a strong opinion on how things are
done as long as the two are kept in sync reliably (ideally
automatically, but most importantly without relying critically on
a single person).


        Stefan



  parent reply	other threads:[~2012-06-04 13:34 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-02  7:47 Merging CEDET Chong Yidong
     [not found] ` <4FCB6B01.8020600@siege-engine.com>
2012-06-03 18:00   ` David Engster
2012-06-03 21:51     ` Lluís
2012-06-04 13:34     ` Stefan Monnier [this message]
2012-07-28 15:32     ` Chong Yidong
2012-07-28 15:38       ` Emacs 24.2 merge window (was: Merging CEDET) Bastien
2012-07-28 16:23       ` Merging CEDET David Engster
2012-07-29  3:21         ` Chong Yidong

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=jwv8vg3td98.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=cyd@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=ericludlam@gmail.com \
    --cc=xscript@gmx.net \
    --cc=zappo@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 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).