From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: MPS experiment successful Date: Wed, 17 Apr 2024 22:23:31 +0300 Message-ID: <86wmovg5e4.fsf@gnu.org> References: <86le5cgmp3.fsf@gnu.org> <86bk68gfab.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22529"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Gerd =?iso-8859-1?Q?M=F6llmann?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Apr 17 21:23:47 2024 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rxAsl-0005iU-7e for ged-emacs-devel@m.gmane-mx.org; Wed, 17 Apr 2024 21:23:47 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxAsa-0008Ch-5f; Wed, 17 Apr 2024 15:23:36 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rxAsY-0008CW-D3 for emacs-devel@gnu.org; Wed, 17 Apr 2024 15:23:34 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rxAsY-0006PG-4L; Wed, 17 Apr 2024 15:23:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=YF9UFu3LAiDzj7S1p8o9TTi/hKfjCp12VkPUY3d7B+0=; b=SpdCnewc82KfWwbTH4Vf QWqj8DNqcnG6+Uctyd+F2miO9ZNcMz27+9oWdJnNQ4cACn5QzuzLVI4ZVLUDcu7T8+7rFyOe4ePow L9TCTZHTB78d7m9c8QaXM9yVOq+YrKuMteFASmMzgeGYN7MFucT+b1Fej6rTQ4ONrbSuY/qIVmcvR xr7ISDLuTcDwIYnqXe6RaAJtY9OQlYPU/Vb98SHGKm4DxCFYiuWxeIwFxrJHi7mJhSXC2tUSZQNCA b4OdZZZFWah7NlWY3YP3DbYGo2YS9pNHojD/T+psC/8ihrYkBDgCuQBEDE6X/xRZvV2x2Ely7/sO3 8rTfLHdkSe9TXA==; In-Reply-To: (message from Gerd =?iso-8859-1?Q?M=F6llmann?= on Wed, 17 Apr 2024 20:41:12 +0200) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:317785 Archived-At: > From: Gerd Möllmann > Cc: emacs-devel@gnu.org > Date: Wed, 17 Apr 2024 20:41:12 +0200 > > Eli Zaretskii writes: > > > The packages code will need to be moved aside, yes. But for the rest, > > why shouldn't a simple merge do the job? They seem to be orthogonal, > > by and large. > > Coming to think of it again - how would I tell git merge the difference > between the package related changes and GC related changes? Assuming you know at what commit you started working on MPS, make the diffs relative to that commit. If you didn't in parallel work on packages as well, there should be no problem. If you did make changes to packages while working on MPS, tough. (I'm actually surprised you didn't start a local branch for the MPS stuff. If you did, just make the diffs from that branch.)