From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#23792: bug#28878: CEDET merge bug Date: Mon, 11 Nov 2019 03:07:09 +0100 Message-ID: <87d0dzrws2.fsf@marxist.se> References: <877evtwlse.fsf@engster.org> <871sm0wl6m.fsf@engster.org> <87fuadwo2g.fsf@engster.org> <87o8xnuhr3.fsf@marxist.se> <9358B626-B5C3-4796-A4F8-9447422C16EB@gmail.com> <9c93fa1a-69fc-fbfd-9d83-a31e33a82c80@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="90876"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: David Engster , "Charles A. Roelli" , 28878@debbugs.gnu.org, 23792@debbugs.gnu.org, Edward Steere , Stefan Monnier , "Eric M. Ludlam" To: Eric Ludlam Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Nov 11 03:08:13 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iTz7k-000NVG-Ix for geb-bug-gnu-emacs@m.gmane.org; Mon, 11 Nov 2019 03:08:12 +0100 Original-Received: from localhost ([::1]:48536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iTz7i-0003o1-Og for geb-bug-gnu-emacs@m.gmane.org; Sun, 10 Nov 2019 21:08:10 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53733) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iTz7b-0003nl-04 for bug-gnu-emacs@gnu.org; Sun, 10 Nov 2019 21:08:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iTz7a-0003Q9-0d for bug-gnu-emacs@gnu.org; Sun, 10 Nov 2019 21:08:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:44098) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iTz7Z-0003Pl-Tc for bug-gnu-emacs@gnu.org; Sun, 10 Nov 2019 21:08:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iTz7Z-0004cw-KV for bug-gnu-emacs@gnu.org; Sun, 10 Nov 2019 21:08:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 11 Nov 2019 02:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23792 X-GNU-PR-Package: emacs Original-Received: via spool by 23792-submit@debbugs.gnu.org id=B23792.157343804117736 (code B ref 23792); Mon, 11 Nov 2019 02:08:01 +0000 Original-Received: (at 23792) by debbugs.gnu.org; 11 Nov 2019 02:07:21 +0000 Original-Received: from localhost ([127.0.0.1]:52919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iTz6v-0004bv-6Q for submit@debbugs.gnu.org; Sun, 10 Nov 2019 21:07:21 -0500 Original-Received: from host.gofardesign.uk ([208.79.239.190]:60669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iTz6s-0004ba-8G; Sun, 10 Nov 2019 21:07:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=marxist.se; s=default; h=Content-Type:MIME-Version:Message-ID:Date:References: In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=1tOhZgr4/kUlPF+fJoBxOqBAab6g9UZk0kNQOFzuCnk=; b=IpXdaJCZq1TsI2st5PVC/+c3KV VRplBH/TO+4pIANHYonavtpwrhrvAXthQdve6JGGAFTfuSVfPqjyklL3rEzl8zTMbl73QXOmlq0xR Q2lxWpKDI9gZiCiHbNo13/J46GWK8Pg5XeYc3io7B7Nex8+uFOfLy+3BIy8hS5Ui+A3s=; Original-Received: from h-70-69.a785.priv.bahnhof.se ([155.4.70.69]:33500 helo=localhost) by host.gofardesign.uk with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1iTz6l-0000Ea-8t; Sun, 10 Nov 2019 20:07:11 -0600 In-Reply-To: <9c93fa1a-69fc-fbfd-9d83-a31e33a82c80@gmail.com> (Eric Ludlam's message of "Sun, 10 Nov 2019 19:11:42 -0500") X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - host.gofardesign.uk X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - marxist.se X-Get-Message-Sender-Via: host.gofardesign.uk: authenticated_id: stefan@marxist.se X-Authenticated-Sender: host.gofardesign.uk: stefan@marxist.se X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:171402 Archived-At: Eric Ludlam 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