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: scratch/igc as feature branch Date: Thu, 04 Jul 2024 06:15:08 +0200 Message-ID: References: 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="35106"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-devel@gnu.org To: Andrea Corallo Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Jul 04 06:16:28 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 1sPDtU-0008yg-Jj for ged-emacs-devel@m.gmane-mx.org; Thu, 04 Jul 2024 06:16:28 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPDsc-0007Le-OB; Thu, 04 Jul 2024 00:15:34 -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 1sPDsb-0007KG-70 for emacs-devel@gnu.org; Thu, 04 Jul 2024 00:15:33 -0400 Original-Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPDsM-00059B-U4; Thu, 04 Jul 2024 00:15:32 -0400 Original-Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a751ed17b1eso224478366b.1; Wed, 03 Jul 2024 21:15:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720066511; x=1720671311; 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=/rKQ8TrSafb6a4Nzw4FoUq4MLlkzl3I2QiiZfH9tHnE=; b=B3qptH2NsvnMFEvXUbr+YyPVIaWD6YLrConaZLp6YCS77EWjdIZpRGulriN0xwvc2G o6yWaR2yGx9WmIqK7zc8MvoCZ1RsWfY7bWbEO+k9Hv0ZhKPCgyc2R0bAFVH+K4yQ5NP5 1df2o0rUhl0Fj9KxTWtrAE2Y0qIhITFT3a9CBpgPi3VG/so14QEqHlI6lN8G13oRLr40 6L1Mcx5793mnN5VxSJdII39Z68XoGY4q1IB883HX00Ei8nymZnDHmcKwNvA9OmjxFrDU CLP6xPijoyvq4BquzXCug/3Py6/9da0mdv/P2wAg/1/qfNup+Jb8zS5bvKYRS3r+Almk VXoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720066511; x=1720671311; 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=/rKQ8TrSafb6a4Nzw4FoUq4MLlkzl3I2QiiZfH9tHnE=; b=TdIGcOUejZCCexo1JqvrprVAt69w7bY+h9qEtZnkEJLN5kyIdpJpg1Gbiqmzd/nR17 DelniSI2VyLTQ3CSCnUT2K11T9DLmpJUcYA61hWCsJvGmK72l3dlQgpKrF5/0CKl9t0f 0kr2ychqAuEpbIsgcSg7ME5gFKPrJR456imBvBfzdK5BP8uufBOP6GPo5Rc74Adxsjx0 5P3hZpBt040pJ3D0isJRUwVcotqvSDIDDKQGor2MDGi2qHUB0J8R6oaxWUctkFsKF9nG FgwMHDmUC6z5cp7pPwRcxlR1v3cd3eUvtVGa7vYBYHp87hPZQQ005PGjhlVzbPCJi3ny F12w== X-Gm-Message-State: AOJu0YwFInsHcenvN9ZeiLYRHCk7KouDGncDiyrYPuyIWiyEO9gTmqdE uPCx9QPDF5TqLpzfeTG8PmhKqPg2e1BTvI9/C8nuCPzAKiTt0YbUhDlllA== X-Google-Smtp-Source: AGHT+IFtqZIZmRjtomGMsSoHK+DJNQLSPnOUeQtiBAuABHEikPo2VfT/zZtZ+HG3ZXYTDC8AGP7zIA== X-Received: by 2002:a17:906:174e:b0:a72:7a71:7f4f with SMTP id a640c23a62f3a-a77bd99ec0fmr20678466b.7.1720066510200; Wed, 03 Jul 2024 21:15:10 -0700 (PDT) Original-Received: from pro2.fritz.box (pd9e36fa8.dip0.t-ipconnect.de. [217.227.111.168]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a77b788be53sm19226366b.182.2024.07.03.21.15.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 21:15:09 -0700 (PDT) In-Reply-To: (Andrea Corallo's message of "Wed, 03 Jul 2024 18:04:16 -0400") Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=gerd.moellmann@gmail.com; helo=mail-ej1-x62e.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, 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:321292 Archived-At: Andrea Corallo writes: > Gerd M=C3=B6llmann writes: > >> Andrea Corallo writes: >> >>> - The fact that the branch is already worked with commits that will be >>> directly mergable without having to do a mega rebase afterward. Also >>> the mega rebase would cancel all or part of the history which I find a >>> serious disadvantage. >> >> Hm, that makes me curious. >> >> Does it mean that in the end, before merging, every commit must have a >> conforming commit message? > > I don't know if we have to be 100% strict on this, my opinion is that > would be a pity to loose the history of the branch we already have, but > others might have other opinions.=20=20 Not sure what you mean with loosing the history. Do you mean the git history? If so, how would you loose that? Squashing? I'm confused. > OTOH given we know *now* that the goal is to try to merge, it would > feel very weired to me to deliberatly ignore what we have in > CONTRIBUTE as requirements for commits we are writing now and we know > we want to include. Sorry, I was asking about existing commits, not the future. I'm asking because you mentioned rebasing which I take to mean interactive rebasing to write new commit messages otherwise I don't know how rebasing comes into play. My question is if that's correct and if so who is supposed to write all these commit messages? And the number of commits give an impression of the amount of work involved. >> Also, there are probably many hundreds of >> commits that are not in scratch/igc at all, but only in my original. >> What's with those? > > We are discussing igc, how do these other commits come into play? The igc branch on github is the original, containing the whole truth from day 1. I created scratch/igc by taking my changes after some 500+ commits and applying them to master at that time. (And FWIW I'm not using scratch/igc for anything.) I suppose you know all that. My question is what's with commit message of the initial commit in scratch/igc? There is definitely a cut point there. The history of 500 commits is lost. Git history.