From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?Gerd_M=C3=B6llmann?= Newsgroups: gmane.emacs.devel Subject: Re: MPS experiment successful Date: Wed, 17 Apr 2024 21:51:07 +0200 Message-ID: References: <86le5cgmp3.fsf@gnu.org> <86bk68gfab.fsf@gnu.org> <86wmovg5e4.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7723"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Apr 17 21:52:02 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 1rxBK6-0001kr-II for ged-emacs-devel@m.gmane-mx.org; Wed, 17 Apr 2024 21:52:02 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxBJM-0001P8-0S; Wed, 17 Apr 2024 15:51:16 -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 1rxBJJ-0001Os-Gt for emacs-devel@gnu.org; Wed, 17 Apr 2024 15:51:13 -0400 Original-Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rxBJH-0006Cv-TR; Wed, 17 Apr 2024 15:51:13 -0400 Original-Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-41882c16824so1143615e9.3; Wed, 17 Apr 2024 12:51:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713383469; x=1713988269; darn=gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qbFZQhQL6+iDHBPwvOkgqytpA3JjjnmFNFihPMQXT/I=; b=Oxvv5dKwM4yLP/lTN6DlPdgquTDdLHLs7IqN9f0w+6GCVp02RmgjCoQXB7DgyZMblJ aFywkc3JMxA0Kgkb498OoC5ERHkYzXV5AIUSoVwzdrQXm3iXr6FrPOETufkmMqlzaIKR Cc484tFFfkMUnO/1+9L1Bxc6CPJa+W+X2qLSQLl0OhRkjKiON1fmzEEyBENya+gXF3ok kzHOZmg25eVi5/Xn0RVe+jeiEQ7VZdwrEZaBbXs02qVjcL0YfNFru9LLORpx9Y+GoX81 f5GFyCAKiAranZvEG9keu5pKwxmcNwtSRt7qU+xEfyIdzD68UKYT07nnG5CgEZSGMjqC laiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713383469; x=1713988269; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=qbFZQhQL6+iDHBPwvOkgqytpA3JjjnmFNFihPMQXT/I=; b=YaWtnOqiMWlnANAohsz9bNA3VJqTXcl6lkUBNv0jFdYDQNHbvtCNcgp2PoQ7QCUPP2 dcLkLDZuRGk65WI9paCwHoXz7W/5d4mj0YBUOvRczt1tHtYK2gr5kqMYvQD7w1klNeWx pXxYV/YkOQhSRo6PGeXkgJwnvRJNp6ORpSyfeA9d/g5mACTrItkO9t3/ZnRNzLf1e7sh NjqPmm9wxPPkOIQaKXgc0wayM6R1o/yhJ43NytksdIZ8X5x/tKmVEE3FIdF5D8y0EIch WfbpI6xBUUgaALyIFh0nKf6WICDAVYHPT6u5ZjDo9uKwMHeyFDrYG6NGNy8M6JhSq1iy oNeg== X-Gm-Message-State: AOJu0YyIFZtV8Jl1uuLGBdOO4+0v/pTYzY9xf7vTk8MJkdNMzBotYzq2 RYSaf9AnxYT6IIZuTxT90FgfdGsVJedXaRB1WWXeAW2H1inNB104r8Nng71Z X-Google-Smtp-Source: AGHT+IFXQ8s9CHVJuPYbEubvtwXF+4Ba2t4Zg1VTiU96z9tBWAdX0jAFk/M6eJMD4EXHJISbVeYOKg== X-Received: by 2002:a05:600c:548f:b0:417:d9b1:5e19 with SMTP id iv15-20020a05600c548f00b00417d9b15e19mr472283wmb.21.1713383469060; Wed, 17 Apr 2024 12:51:09 -0700 (PDT) Original-Received: from Pro.fritz.box (pd9e3638b.dip0.t-ipconnect.de. [217.227.99.139]) by smtp.gmail.com with ESMTPSA id n2-20020a05600c4f8200b0041884b79b81sm122797wmq.1.2024.04.17.12.51.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 12:51:08 -0700 (PDT) In-Reply-To: <86wmovg5e4.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 17 Apr 2024 22:23:31 +0300") Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=gerd.moellmann@gmail.com; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:317786 Archived-At: Eli Zaretskii writes: >> From: Gerd M=C3=B6llmann >> Cc: emacs-devel@gnu.org >> Date: Wed, 17 Apr 2024 20:41:12 +0200 >>=20 >> Eli Zaretskii writes: >>=20 >> > 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. >>=20 >> 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. Thanks, I thought you meant git merge. Patch formatting could work, but loses the history, of course. Which wouldn't be very interesting, unless someone wants to watch me learning MPS. And Emacs internals :-). > (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.) Not sure what you mean. I branched cl-packages from master a longer while ago, on Github. That branch has the packages stuff, and I merged master into it once in a while. Then I branched the igc branch from cl-packages, so it has both the package stuff and the MPS stuff. And I think I merged cl-packages into igc once or twice. And yes, a diff cl-package...igc could work, or what the syntax is.