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: Wed, 03 Jul 2024 21:37:42 +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="15090"; 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 Wed Jul 03 21:38:41 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 1sP5oN-0003f3-S2 for ged-emacs-devel@m.gmane-mx.org; Wed, 03 Jul 2024 21:38:39 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP5nZ-00024l-9x; Wed, 03 Jul 2024 15:37:49 -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 1sP5nX-00024J-Kk for emacs-devel@gnu.org; Wed, 03 Jul 2024 15:37:47 -0400 Original-Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sP5nW-0002jG-5t; Wed, 03 Jul 2024 15:37:47 -0400 Original-Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-58c947a6692so2050835a12.0; Wed, 03 Jul 2024 12:37:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720035464; x=1720640264; 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=kmoORHU/RctWf0GmnpLrPWKYV9IEycqitQC3e4gsucY=; b=N1dfLVDzi2e7z0f9f4sYohDbvYL+dSyWhkGNTHSRRtOIRVGWE4mQi6JX/3ioQCLcOA kNk+rRNevLC0aYOfc5w2vW/WC+plKhN29+JpwCc4zZ5izKy0pJDnoveSzzqcZ3i0WH16 fdRJe7Bx6i35wbmylwruea8uMtG+YARX8sE3wnJzftBW/R6f4+w2ygC4Z94t0CvGk9Ep qcx+68zSdjWfXHWzfD9GV9Xc+JLSB1+E975fBbuK+zF4wUrCRrr8b1Zh0XWrLlY+Bs+G qVYrvdHChzD+QeKjFL7bw4vmxXegdiH8XXTK0r8uuyL3uBS2z4veJdjC7x3ZDWrKGkM6 w8JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720035464; x=1720640264; 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=kmoORHU/RctWf0GmnpLrPWKYV9IEycqitQC3e4gsucY=; b=CkHjwaW/I6Waql0+ZV3o4jYuHIQijpOKoBXL6l2ubK8QgAeeQeiV6+W5uEJUNHGlBp 1S7jJNJvnSuSS+ylXML8ZM4Eha89wE5eqlckj0QEjdr+dHVxDo0++2dtnrS28po8bKTI FVn7OWF8rbzHybCFyAhynafjFHIy0XcJ+mdJZbHY4U8vaD3A+nHJNsxTqRrfVARvRLje raEsVqshLEcm/dyQDKdxhnbifeln0BnHouFN+Rni0YIKDL53GE1nbMmizRbcH9vYCkBy OxVUeLBMswfo9sfcpPCdxWknTsVtlshYQKFgHhAAg0UNssZKBdJsOYpEwQbbc+AVvYfS OXGw== X-Gm-Message-State: AOJu0YwbmBIHpZUyqKntNBc9ePosLU9gbAF7T3wvdTC15uwfGa1PeP+n deoJpGKrZzkvO0oaT6WKKqsSttcvGJQs2yaVAQLp2mp5sRwlABEqYez47Q== X-Google-Smtp-Source: AGHT+IEHpomp+dX0cS7IrsKFirgt5jMyQeD/fZ9IJjU4cpvUMfmgz4keqcF9JidjdbYCbnoNt0i5Ew== X-Received: by 2002:a17:907:2d0d:b0:a72:75a5:bb46 with SMTP id a640c23a62f3a-a75148705cfmr1025893766b.13.1720035463673; Wed, 03 Jul 2024 12:37:43 -0700 (PDT) Original-Received: from pro2.fritz.box (pd9e362dd.dip0.t-ipconnect.de. [217.227.98.221]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a76841c4ffcsm133874866b.41.2024.07.03.12.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 12:37:43 -0700 (PDT) In-Reply-To: ("Gerd =?utf-8?Q?M=C3=B6llman?= =?utf-8?Q?n=22's?= message of "Wed, 03 Jul 2024 21:29:49 +0200") Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=gerd.moellmann@gmail.com; helo=mail-ed1-x52e.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:321283 Archived-At: 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? 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? Some numbers, hope I got the git right /Users/gerd/emacs/github/igc % git rev-list --count cl-packages..igc --firs= t-parent 980 /Users/gerd/emacs/savannah/igc % git rev-list --count master..scratch/igc -= -first-parent 431