From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.devel Subject: Re: Reconsider defaults for use-package-vc-prefer-newest Date: Sun, 29 Sep 2024 07:22:10 -0700 Message-ID: References: <87wmj7dftf.fsf@posteo.net> <87setvxyt6.fsf@gmail.com> <87jzf7o13b.fsf@posteo.net> <87msk3jr0u.fsf@gmail.com> <87setum5do.fsf@posteo.net> <87msk1520e.fsf@gmail.com> <87settknf1.fsf@posteo.net> <87tte8akwa.fsf@gmail.com> <878qvjaep6.fsf@posteo.net> <87cykvwixn.fsf@gmail.com> <3BC7EB33-504C-4532-A2DF-83712B64878E@gmail.com> <86v7yh8ugg.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17122"; mail-complaints-to="usenet@ciao.gmane.io" Cc: suhailsingh247@gmail.com, emacs-devel@gnu.org, philipk@posteo.net, meedstrom@runbox.eu, tonyzorman@mailbox.org To: Eli Zaretskii , Charles Choi Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Sep 29 16:23:04 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 1suupD-0004HI-2C for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Sep 2024 16:23:03 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suuoS-0003MV-MO; Sun, 29 Sep 2024 10:22: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 1suuoR-0003MF-4o for emacs-devel@gnu.org; Sun, 29 Sep 2024 10:22:15 -0400 Original-Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suuoP-0004QB-Kc; Sun, 29 Sep 2024 10:22:14 -0400 Original-Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a8d4093722bso540172166b.0; Sun, 29 Sep 2024 07:22:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727619732; x=1728224532; darn=gnu.org; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=JP+IqtchRPLK9bJkpww29ItAClUmDYWzJeqALABvtwI=; b=WOGv+KoE1BwtZYQ+ARYT3I3mQpslLXAoy5JtU46FMvTr55ROGqpYv6eUWfMER8I5c3 JvB431UDTU/ygewse82iIYj8z9vys09L9TS61pm/GB2xD4hKx9ee76qtV9y4Ypi3A1CK UoXH07Yci3ItjdP47Tod1E+kjeRkkd8kYEyAKFYCBHEorT1SxsWgNDmY1n+EIk9NLI0m YjTKpiyDSPGVyk594ia6ompR10VQrteDUsLlp7h52xVrF3Hq+tKVomVtTbrdmPv+4yw/ fwEyRJgrUHy6e6XOufbAuFKRDkKQrrQhvhowk+dk8nqhp5rAWB+g1tY+4fHZlccUUZar iiog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727619732; x=1728224532; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=JP+IqtchRPLK9bJkpww29ItAClUmDYWzJeqALABvtwI=; b=Y2poOQUoVbcmL7IQluY9coUNjYxNDwsmw2tQjXFoAVN7EZ5bQlf5X0LHCbI94MbkES tBVAEg4uRv2yLuxKxP27OPC7fzRiPEncLy8cirumrwkGFQag4ISfqj6piDEhjXdcXTwy t2ejV+bTq0BBqP/tATSN4G2kuVs1seEqowt3zrDenufnChvHkFxDICm1T0SWq2caFIqj tuPyXWrOW4FXKOtTwAUvAIwmRenVlp31OWmJi77bh/D5uCBVsYUFG783RD54q2fPdalc 7B9MmwgyhIYONRf71NXXUo4sX3pPMoUlpyqDZ/bgBYhbe2sPGeeGAAwd5FroMcVhMw0c zr9g== X-Forwarded-Encrypted: i=1; AJvYcCXiDjn5P41e7j2tSh4TvvlvUcwWG9NbvSUF/epA2SAtIaSqahAJonwifwodc6U1uOmw8jFoKEaWYOLYDg==@gnu.org X-Gm-Message-State: AOJu0YwGORkt9fqjzxFDPgqam+p1Y4vPQevyDvbPlaeJOWe0eW5aWbIg 79bN9F6MY3pfMFyCqyyG5JNSxmOqljfN9h7r9XINgmKEEQb2mlrGkOpe5vrjDXmXZWw/8dPBWFU mPvux1pqdzQRwajXD7UfkEUoU45hldQ== X-Google-Smtp-Source: AGHT+IHFv8miNqTtr+yTMwrK5Nkw2Zpjs913RQOPbZHBpBEmm/DvbO8VVwHdy4SkBYQMBUurdRr/11akguSOXQKRdfk= X-Received: by 2002:a17:907:1c24:b0:a8a:822e:44c6 with SMTP id a640c23a62f3a-a93c48e7fb7mr1136836266b.4.1727619731327; Sun, 29 Sep 2024 07:22:11 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sun, 29 Sep 2024 07:22:10 -0700 In-Reply-To: <86v7yh8ugg.fsf@gnu.org> Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=stefankangas@gmail.com; helo=mail-ej1-x636.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:324191 Archived-At: Eli Zaretskii writes: > The above seems to indicate there's some kind of bug in deciding > whether there's a commit mismatch, because I don't see anything wrong > with what you do. The problem is the order in which the steps are taken. A git tag should be added only to those commits that bump the "Version" header, or you will run into problems. In other words, this: 1. Create a feature branch from the `main` branch. 2. Bump the `Version:` header. 3. Make commits to the feature branch. 4. Merge the feature branch back to `main`. 5. Tag `main` with the `Version:` header value. Should be done like this instead: 1. Create a feature branch from the `main` branch. 2. Make commits to the feature branch. 3. Merge the feature branch back to `main`. 4. Bump the `Version:` header. 5. Tag `main` with the `Version:` header value.