unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Daniel Clemente <dcl441-bugs@yahoo.com>
To: emacs-devel@gnu.org
Subject: Re: CEDET sync
Date: Sun, 06 Jun 2010 08:34:17 +0200	[thread overview]
Message-ID: <87pr04k6ty.fsf@yahoo.com> (raw)
In-Reply-To: 86d3w660d1.wl%lluis@ginnungagap.pc.ac.upc.edu

>
> 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).
  That means they don't work with „a directory which contains CEDET“, but with „a directory which contains the whole Emacs, including CEDET“. Obviously their changes will affect mostly the CEDET part and not the rest of Emacs.
  To bring changes by Emacs' trunk developers into the CEDET branch, use bzr pull (bzr merge if there were conflicts). It will be easy because both branches have a common ancestor.
  To push CEDET changes to Emacs' trunk, use bzr push. It will be as easy. You don't have to worry about putting things in the correct subdirectory because the file structure is the same in both branches.
  In order to package CEDET in a .tar.gz, care should be taken to select only the CEDET-related files and not the whole Emacs.

  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.


  Greetings,
Daniel




  parent reply	other threads:[~2010-06-06  6:34 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
2010-06-04 20:53         ` Stefan Monnier
2010-06-06  6:34         ` Daniel Clemente [this message]
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=87pr04k6ty.fsf@yahoo.com \
    --to=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 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).