all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Lluís <xscript@gmx.net>
Cc: emacs-devel@gnu.org, "Eric M. Ludlam" <eric@siege-engine.com>
Subject: Re: CEDET sync
Date: Fri, 04 Jun 2010 16:53:25 -0400	[thread overview]
Message-ID: <jwvocfqil3x.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <86d3w660d1.wl%lluis@ginnungagap.pc.ac.upc.edu> ("Lluís"'s message of "Fri, 04 Jun 2010 21:53:14 +0200")

> 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).

I don't know of any good answer either.

Maybe the best option is to make the upstream repository "track" the
Emacs repository; any change made in Emacs can be trivially merged back
into upstream.

Then every once in a while, someone syncs up the upstream with the Emacs
code (mainly overwriting the Emacs code with the upstream code, but
being careful to avoid race conditions where someone commits to the
Emacs repository between the last merge and the actual overwrite).


        Stefan



  reply	other threads:[~2010-06-04 20:53 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 [this message]
2010-06-06  6:34         ` Daniel Clemente
2010-06-06 13:21           ` Lluís
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=jwvocfqil3x.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=emacs-devel@gnu.org \
    --cc=eric@siege-engine.com \
    --cc=xscript@gmx.net \
    /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.