unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: David Engster <deng@randomsample.de>
To: Stefan Kangas <stefan@marxist.se>
Cc: Edward Steere <edward.steere@gmail.com>,
	28878@debbugs.gnu.org, "Charles A. Roelli" <charles@aurox.ch>,
	23792@debbugs.gnu.org
Subject: bug#28878: CEDET merge bug
Date: Sat, 16 Nov 2019 09:49:58 +0100	[thread overview]
Message-ID: <8736eotdc9.fsf@randomsample> (raw)
In-Reply-To: <87o8xnuhr3.fsf@marxist.se> (Stefan Kangas's message of "Fri, 08 Nov 2019 05:14:24 +0100")

Stefan Kangas writes:
> David Engster <david@engster.org> writes:
>
>> Edward Steere writes:
>>> I count 165 commits since the last merge when I look at cedet.git
>>> and I only see 49 commits in emacs.git from your work on the
>>> merge.  What about the other 116 commits?
>>
>> I dropped all commits that did not concern the subset of CEDET that is
>> in Emacs proper. It is entirely possible of course that I made a mistake
>> here or there; it'd be nice if someone could check.
>>
>> -David
>
> That was 3 years ago.  What's the current status of this merge -- has
> it been completed?

No. After being fed up with the Emacs maintainer at the time I stopped
working on this. My final work was the last-cedet-merge branch, which
should contain all yet unmerged patches from the SourceForge repo.

-David





      parent reply	other threads:[~2019-11-16  8:49 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-17 18:43 bug#28878: CEDET merge bug Charles A. Roelli
2017-10-17 20:40 ` David Engster
2017-10-18  5:38   ` Edward Steere
2017-10-18 15:05     ` David Engster
2017-10-20 16:46       ` Edward Steere
2017-10-20 20:40         ` David Engster
2017-10-26 18:31           ` Charles A. Roelli
2019-11-08  4:14           ` bug#23792: " Stefan Kangas
2019-11-10  7:48             ` Edward Steere
2019-11-10 21:07               ` bug#23792: " Stefan Kangas
2019-11-11  0:11                 ` Eric Ludlam
2019-11-11  2:07                   ` bug#23792: " Stefan Kangas
2019-11-16  8:49             ` David Engster [this message]

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=8736eotdc9.fsf@randomsample \
    --to=deng@randomsample.de \
    --cc=23792@debbugs.gnu.org \
    --cc=28878@debbugs.gnu.org \
    --cc=charles@aurox.ch \
    --cc=edward.steere@gmail.com \
    --cc=stefan@marxist.se \
    /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).