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 cHUxEVnr9WTrAwAAG6o9tA:P1 (envelope-from ) for ; Mon, 04 Sep 2023 16:36:09 +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 cHUxEVnr9WTrAwAAG6o9tA (envelope-from ) for ; Mon, 04 Sep 2023 16:36:09 +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 11C2F47C5F for ; Mon, 4 Sep 2023 16:36:09 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=lendvai.name header.s=protonmail3 header.b=oxZ542c8; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1693838169; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=g+7cYM986hww7Uya4TZ+e5Z88NAvpGatHmysSap+o7g=; b=sWzNH5mY+9RIQz2sQAHAM7sY2GYOO0n+TpWVy7jW3T8MUiTInyFiZm2PqgeCjlH37RpMxQ AXbdO/+HD5CoPdPEe5zIxfLPNM24DygTOW3TUJoskFiTzvFLpp1Eay0FqwbPAcuiwzAsQv XZ1x/umAgdPZyHD/gLksmlTAfHoJaL1xkn3g3hLOgiutTMqi0PC5SIlagm4Q6xNqrRpPSX dPJAx+TkO1c6GFsMKkiE+2JsHP01okGgXJjl7lDThqKw6vdrlnWikfynSldLLqQQmp7mWc bMakgy8NNPg9qvGcmI+3bBjc/piEQ1C8otDbnjbfCjcB0N9xhKdlZcsYEHp4rA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693838169; a=rsa-sha256; cv=none; b=PWY5ln3xmPRiKKibGoU45MwBtl8wlJU4tzxqN/a+BWILWabxJtsCWbvuSfF0BhU49+8kip yBKHXFA5YBDHR3U8D7anI/4fJRzB0s+DcbY38/D3nksuOftfm5RaVIkpipXbCikXIhpCWB 9Lq5Uu8qE0FPL72KxwrwdMfpNYG1lOGanSmwQ6AYwFBZlJ7LrNGKYD1jObgSTispFA3oTV bJesjrafJQ5So4TPk8bjCJL9u/36t0lZTNyq2cGEwE4qQRDl9JcL9NuGFQuA+a+J49CFC+ IMFgxL7vQhHVsjoJrqc/o6jbiAYnKTcf7HT2lFFAT7epk2xitlrqWOEe3YifKA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=lendvai.name header.s=protonmail3 header.b=oxZ542c8; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=none Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdAfn-0001Xj-H6; Mon, 04 Sep 2023 10:35:27 -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 1qdAfm-0001XX-K5 for guix-devel@gnu.org; Mon, 04 Sep 2023 10:35:26 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qdAfi-0001C7-8r for guix-devel@gnu.org; Mon, 04 Sep 2023 10:35:26 -0400 Date: Mon, 04 Sep 2023 14:35:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lendvai.name; s=protonmail3; t=1693838117; x=1694097317; bh=g+7cYM986hww7Uya4TZ+e5Z88NAvpGatHmysSap+o7g=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=oxZ542c8PoWsjxVsfRQRD6qRjMwjR/JtwvjiQ11PdGz3yUAhRsv8o+YBE9nz91QbF OpZyXu9kvTgiYLQQoJgKI8AQLZvHWynKRsPm4mbkhEXItk4/iHea3lHNx8STDtA7aQ Mh7QI6i23v57iz15GC2V017XrPIaIyUxpFgC+/P64HF0ixmtAxaPConnv9xaD5VHbf matML/2NydBW4su2+uAtVTjujWyBUs6lJdEknXkZZ90AjY+yl5Np1X4lrOQsiMRaYg NcYfSZvZNHRhhrpj2GiGDNE6yyfY2dptS/aGEoz9iNDFkkY3sICEsD65Z7/Wwb83e0 J3J1Z5NHXe62w== To: brian From: Attila Lendvai Cc: Csepp , paul , Giovanni Biscuolo , Katherine Cox-Buday , guix-devel@gnu.org Subject: Re: How can we decrease the cognitive overhead for contributors? Message-ID: In-Reply-To: <874jkads65.fsf@spork.org> References: <871qfsuvad.fsf@gmail.com> <8e74c4ac-a6f3-9127-7e13-593a2eb70432@gmail.com> <87a5ubqxm6.fsf@gmail.com> <877cp8965f.fsf@xelera.eu> <8eb1be08-4c3a-bd30-46c7-4ed653c4bb12@autistici.org> <87ledotmqc.fsf@riseup.net> <874jkads65.fsf@spork.org> Feedback-ID: 28384833:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.43.17; envelope-from=attila@lendvai.name; helo=mail-4317.proton.ch 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, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx2.migadu.com X-Spam-Score: -4.37 X-Migadu-Queue-Id: 11C2F47C5F X-Migadu-Spam-Score: -4.37 X-TUID: JuPAFTJwl6Ue > I've got something like 6 patches waiting, all have been sitting around > for many months. They'll get some committer attention and then it drops > off and nothing happens. To me, that sounds like people lose track of > it, because debbugs doesn't allow people to stay easily on top of > patches they're interested in. Possibly we need some kind of concept of > patch stewards that can see something through. yep, same impression here. > I have more things I want to do with Guix, but it's tough, because I > have to maintain each of my patches separately in different branches, so > that I can rebase them as necessary and resubmit them cleanly if > necessary, or simply just to work on them when issues come up. But my > master branch pulls in each of them, so any time I need to pull, I've > got a list of things (switch to every branch, rebase, fix if necessary, > switch back to master, reset to origin/master, then merge all the > branches I'm maintaing). Adding more branches on top of the ones I > already have is just too much. here's a script that i use to prepare an 'attila' branch that i can `guix p= ull` from: $ cat ../rebase-my-guix-branches.sh #!/usr/bin/env bash BRANCHES=3D"kludges ui-warnings trezor4" # kludges-sent shepherd-from-git # ddclient idris set -e initial_branch=3D$(git branch --show-current) git rebase attila-baseline attila-initial-commit git checkout attila git reset --hard attila-baseline git pull . attila-initial-commit for branch in ${BRANCHES}; do echo "*** Processing branch ${branch}" #git rebase attila-baseline $branch git cherry-pick attila-baseline..$branch done #git checkout $initial_branch git -c pager.log=3Dfalse log --pretty=3Doneline attila-initial-commit~1..at= tila-initial-commit ---------------- explanation: i `git tag -f attila-baseline` on some commit, typically i pull master and = on its head. then i have a branch called attila-initial-commit that holds a= single commit that adds my key as authorized. this script cherry-picks all the listed branches, and at the end it prints = the commit hash of the initial commit that i can then copy-paste into my ch= annels.scm file. whenever cherry-picking fails, i abort it, manually rebase the branch in qu= estion, and then restart the script. HTH, --=20 =E2=80=A2 attila lendvai =E2=80=A2 PGP: 963F 5D5F 45C7 DFCD 0A39 -- =E2=80=9CFreedom is strangely ephemeral. It is something like breathing; on= e only becomes acutely aware of its importance when one is choking.= =E2=80=9D =09=E2=80=94 William E. Simon