From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stephen Leake Newsgroups: gmane.emacs.devel Subject: Re: CEDET Merge Date: Tue, 17 Jan 2017 15:22:48 -0600 Message-ID: <86shoh8jpz.fsf@stephe-leake.org> References: <87r348ul9n.fsf@gmail.com> <87lgugm2qg.fsf@gmail.com> <87inpelu8i.fsf@gmail.com> <837f5uajlk.fsf@gnu.org> <87a8aqlqz8.fsf@gmail.com> <8360leahxr.fsf@gnu.org> <8760lelq68.fsf@gmail.com> <83wpdt8yo2.fsf@gnu.org> <87inpd650y.fsf@gmail.com> <8660ldabje.fsf@stephe-leake.org> <8737gh5sqw.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484688206 10548 195.159.176.226 (17 Jan 2017 21:23:26 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 17 Jan 2017 21:23:26 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.91 (windows-nt) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Edward John Steere Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 17 22:23:22 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cTbDb-0000X4-GZ for ged-emacs-devel@m.gmane.org; Tue, 17 Jan 2017 22:23:03 +0100 Original-Received: from localhost ([::1]:37750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTbDd-0005UU-VY for ged-emacs-devel@m.gmane.org; Tue, 17 Jan 2017 16:23:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTbDY-0005UF-1Y for emacs-devel@gnu.org; Tue, 17 Jan 2017 16:23:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTbDS-0004x3-V3 for emacs-devel@gnu.org; Tue, 17 Jan 2017 16:23:00 -0500 Original-Received: from smtp137.ord.emailsrvr.com ([173.203.6.137]:33263) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cTbDS-0004wY-Q1 for emacs-devel@gnu.org; Tue, 17 Jan 2017 16:22:54 -0500 Original-Received: from smtp14.relay.ord1a.emailsrvr.com (localhost [127.0.0.1]) by smtp14.relay.ord1a.emailsrvr.com (SMTP Server) with ESMTP id 112F4401E3; Tue, 17 Jan 2017 16:22:52 -0500 (EST) X-Auth-ID: board-president@tomahawk-creek-hoa.com Original-Received: by smtp14.relay.ord1a.emailsrvr.com (Authenticated sender: board-president-AT-tomahawk-creek-hoa.com) with ESMTPSA id 6DA75401B3; Tue, 17 Jan 2017 16:22:51 -0500 (EST) X-Sender-Id: board-president@tomahawk-creek-hoa.com Original-Received: from Takver4 (76-218-37-33.lightspeed.kscymo.sbcglobal.net [76.218.37.33]) (using TLSv1.2 with cipher AES128-GCM-SHA256) by 0.0.0.0:587 (trex/5.7.12); Tue, 17 Jan 2017 16:22:52 -0500 In-Reply-To: <8737gh5sqw.fsf@gmail.com> (Edward John Steere's message of "Tue, 17 Jan 2017 22:36:07 +0200") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 173.203.6.137 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:211361 Archived-At: Edward John Steere writes: > This brings us to the topic of collaborating on this change. I'm not > aware of any strategy for merging which allows for collaboration; so > I've come up with the following hack (comments/adjustments welcome): > 1. create a staging repository for CEDET and make the requisite folder > structure changes in it I guess that's on SourceForge > 2. create a branch in the Emacs project and merge allowing unrelated > histories I'm not clear what you are merging here. It should not be the whole of CEDET; step 3 should be done first. > 3. delete any files outside of our target folders and commit with > unresolved conflicts That gives us a shared base to work on. > 4. push up the branch and divvy out files/folders for fixing conflicts Ok. > 5. commit and push as we go Ok. > If this sounds like something you'd like to be involved in then I'll > start with steps 1.->3. and follow up when I'm done. Makes sense. -- -- Stephe