GNU bug report logs - #28878
CEDET merge bug

Previous Next

Package: emacs;

Reported by: charles <at> aurox.ch (Charles A. Roelli)

Date: Tue, 17 Oct 2017 18:44:02 UTC

Severity: normal

Merged with 23792

Found in version 25.0.95

Full log


View this message in rfc822 format

From: Stefan Kangas <stefan <at> marxist.se>
To: Eric Ludlam <ericludlam <at> gmail.com>
Cc: "Eric M. Ludlam" <zappo <at> gnu.org>, "Charles A. Roelli" <charles <at> aurox.ch>, 28878 <at> debbugs.gnu.org, 23792 <at> debbugs.gnu.org, Edward Steere <edward.steere <at> gmail.com>, Stefan Monnier <monnier <at> iro.umontreal.ca>, David Engster <david <at> engster.org>
Subject: bug#28878: CEDET merge bug
Date: Mon, 11 Nov 2019 03:07:09 +0100
Eric Ludlam <ericludlam <at> gmail.com> writes:

> If there are puzzles around the merge done so far I can look at them, but I
> don't have commit privileges for Emacs, nor particularly deep git skills.

"git branch -a | grep cedet" yields the following matches:

1. remotes/origin/old-branches/cedet-branch

   Last updated in 2009.  It could perhaps be deleted?  The last
   commit there is a2095e2ed and seems to be on the master branch
   already.

2. remotes/origin/scratch/last-cedet-merge

   Not sure about the status here.  The last commit d2a57bdfec is not
   merged to master AFAICT.

3. remotes/origin/scratch/merge-cedet-tests

   This seems to be the branch that Edward was working on.

You could check them out in git using something like:

  git checkout --track origin/scratch/merge-cedet-tests

Best regards,
Stefan Kangas




This bug report was last modified 5 years and 268 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.