From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id +IQfIgPw3WS6AAEASxT56A (envelope-from ) for ; Thu, 17 Aug 2023 12:01:39 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id yPA+IQPw3WQ77QAAG6o9tA (envelope-from ) for ; Thu, 17 Aug 2023 12:01:39 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 20B704FC04 for ; Thu, 17 Aug 2023 12:01:39 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=FS07aluH; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692266499; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=UIIqcFpC56R26IBN8x10uYw+TH0XKKw05VpUwFIkH04=; b=oIhL3vXsJjPy+Sqa5iudtGaDJQNKyjA5p/XkjdQs+MH2dCJRtT6hbH+UceXfruvC4qxVB2 KvUF2JbkFe+FuAef3LjCI+9GOG+G03X88/pc4FsTvi3E9Hn1RbU1fnbRvI94MmYe7wxhnT IuJ/0dzfv8eg4fpBa5wmsdBXzRVdSX8crG9eQRaA1azoJINh5WjImo6u+lOaiD+9Xpqx1b 8B3a7kC4Ye6kDwLKkkr/QOPW1qjIOiD//Eb4uqs7QVC7SDqPtuUoQL8kE088mTv1+QjQmJ JSshjCXsyfIJXW+nX+tQyKxZ9krmm8HxJTsOvuvkXsLqPIdi5ZRYa5r6f1QWMg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692266499; a=rsa-sha256; cv=none; b=KAvgPQQVasmIXyDEl77CK5Ct0zAB4drA2ngA4MyA5ocZf+bmwD359ZKAQDdoUscJWeSj2x OGdkX8Jza853Zma3L3n4NE9P7nfg8p9ZdVksiZU/+zEJGQV2zZgupm1F0VYCGU9XYftYTP T4ZmBKdXPKeW7mDcSQN4Y+mmXM0zaDpz2zSgi63iFcT+NSZ5Xxn2/BFBtSeA2RB9rAsJ+q 4UkzgL7B+qEYg565V8nzLt5lKL8A25V8b4SYCKhNQEE7gBHlDqqCDK9wOM1rBv4ljpAqPR NA0TiqMZb77WjT+WbWLPYTlCE5v0GDCQokgKlqtsTEqHxO+qFb3jZdXCFXIMOA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=FS07aluH; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWZob-0003oz-Pe; Thu, 17 Aug 2023 06:01:17 -0400 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 1qWZoN-0003mv-Rd for guix-patches@gnu.org; Thu, 17 Aug 2023 06:01:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWZoM-0005dv-8k for guix-patches@gnu.org; Thu, 17 Aug 2023 06:01:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWZoM-0000op-3z for guix-patches@gnu.org; Thu, 17 Aug 2023 06:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65229] [PATCH 1/2] pull, time-machine: Add '-q' to ignore channel files. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Aug 2023 10:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65229 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: Tobias Geerinckx-Rice , Josselin Poiret , 65229@debbugs.gnu.org, maurice.bremond@inria.fr, Mathieu Othacehe , Christopher Baines , Ricardo Wurmus Received: via spool by 65229-submit@debbugs.gnu.org id=B65229.16922664173074 (code B ref 65229); Thu, 17 Aug 2023 10:01:02 +0000 Received: (at 65229) by debbugs.gnu.org; 17 Aug 2023 10:00:17 +0000 Received: from localhost ([127.0.0.1]:42799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWZnd-0000nW-7V for submit@debbugs.gnu.org; Thu, 17 Aug 2023 06:00:17 -0400 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]:38973) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWZnc-0000nI-0M for 65229@debbugs.gnu.org; Thu, 17 Aug 2023 06:00:16 -0400 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-4ff7ecd0a0dso1095656e87.0 for <65229@debbugs.gnu.org>; Thu, 17 Aug 2023 03:00:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692266410; x=1692871210; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=UIIqcFpC56R26IBN8x10uYw+TH0XKKw05VpUwFIkH04=; b=FS07aluHwBehGSWSzLk8pur7ZnoGKHlh5F+awJDYF/9xLEafFQVdTxduJX5zsm0H9k ayoGp+G4ppHPCr3YUqJCXbuh6/SMdI8ali9dNNkjIFhcZg2GuZ1TChAoJZVY6m1t7vdK mwlmurxsvDlg5GuIOwns97BlgynfwknbkaHfVlbCBWS7+uenZRM+twqFWfg9roYFJ6ny eyzB5+cGsFGy8iVCWCGbDRqYgfNml7c7JTmdUu5kAXhY08RUBeGrKVGWuQuhya+TxB6x 2sb4aDQCmw0uO3UFrkd0B+DgbDas09itPKxoxxHtoqw8a+u+OrjK0hH7OHrF/tyElo+d EKBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692266410; x=1692871210; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UIIqcFpC56R26IBN8x10uYw+TH0XKKw05VpUwFIkH04=; b=QDcFjGZ/RzhivoIAqZCDvPAonTaogVrUmJP6SzKLrtzr8WI6txREifz2sFn3xijaCE LzPwDMg+gCmTykwM3M0nyDkZvGVnh/AAxHHamhQ+b5z8MlzBDrGiXlGvoBd8SdTejzwb GXVZ8edObNW73PkDcxrjifM0lSD3jWA4kXItX5CWBRtDJDkOy7gHjr9+Pqny4FeBOsvC CN8PFtoaj/jEVOOgLC1S/NukxpFXmZY3X3+PJ1AvEIw7/eF9G9R7e2r5fUFBWy21uPBJ uzptVpbAkStLWFeUbM7g6WSDguPjtrfN9TGWE3iWv0zWpgylTAyG9xU+OpXyYp7TvVpT ciJg== X-Gm-Message-State: AOJu0YwklLkT074sl2Bp8zbRt1rHdFlGlZyff94C8CBef5Nfvvuiedy6 2xlolhnfnGOcQNKtVKfyIr8k1x0IQYz+XH6mCyQ= X-Google-Smtp-Source: AGHT+IHL3vC1/vi6t4tzOx8kwzVFovjf0HRWKIhf4tXgEyeYy6X/SAJHcxOAQVsppfIQ/++T474jDEklcQ3hlJL3XzI= X-Received: by 2002:a05:6512:4848:b0:4fe:626e:4572 with SMTP id ep8-20020a056512484800b004fe626e4572mr3152467lfb.5.1692266409616; Thu, 17 Aug 2023 03:00:09 -0700 (PDT) MIME-Version: 1.0 References: <0ee5ee05ea81374342740f06915e9dadb1a92a63.1691767568.git.ludo@gnu.org> <87edk3gn2g.fsf@gmail.com> <875y5eyrl0.fsf@gnu.org> In-Reply-To: <875y5eyrl0.fsf@gnu.org> From: Simon Tournier Date: Thu, 17 Aug 2023 11:59:57 +0200 Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.82 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: 20B704FC04 X-Spam-Score: 2.82 X-TUID: xHVBaW2SfoBn Hi Ludo, On Thu, 17 Aug 2023 at 10:57, Ludovic Court=C3=A8s wrote: > >> -will thus build the package @code{hello} as defined in the master bra= nch, > >> -which is in general a newer revision of Guix than you have installed. > >> -Time travel works in both directions! > >> +will thus build the package @code{hello} as defined in the main branc= h > > > > Why not the master branch? Is the branch renamed from =E2=80=99master= =E2=80=99 to > > =E2=80=99main=E2=80=99? If not, I would keep the explicit master branc= h in order to > > avoid confusion. > > The =E2=80=9Cmain branch=E2=80=9D is the branch currently called =E2=80= =98master=E2=80=99 (I think we > should rename it to =E2=80=98main=E2=80=99 eventually, but I=E2=80=99d ha= ve written @code{main} > if I wanted to imply it=E2=80=99s called that way). I think the term "main branch" is confusing because many forges as Gitlab propose by default to rename from @code{master} to @code{main}. Well, if instead of @code{main}, these forges were proposing @code{trunk} or @code{primary} or whatever else, it would be fine. Therefore, I propose the wording: defined in the main branch of Guix (currently called @code{master}), wi= thout any additional channel, [...] Cheers, simon