all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Jakub Kądziołka" <kuba@kadziolka.net>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 41882@debbugs.gnu.org
Subject: [bug#41882] [PATCH] channels: Allow specifying per-channel --allow-downgrades in the channel file
Date: Fri, 19 Jun 2020 14:25:28 +0200	[thread overview]
Message-ID: <20200619122528.qt3dkxk5nsu6oasc@gravity> (raw)
In-Reply-To: <875zbnijax.fsf@gnu.org>

[-- Attachment #1: Type: text/plain, Size: 946 bytes --]

On Fri, Jun 19, 2020 at 09:52:38AM +0200, Ludovic Courtès wrote:
> How would it affect your workflow if you used merges instead of
> rebasing?

The fundamental difference would be that each merge increases the
complexity of the branch, and as such, has a cost. Sometimes, I get
some merge conflicts; in such a case I want to prepare a new patch that
applies cleanly onto master, such that I can push it easily when the
time is right.

Also, the workflow of rebasing a patchstack allows me to clearly see
which patches are yet to be upstreamed. A history with merges - not so
much.

> With authentication now in place, you probably have to do
> this anyway, or to also disable it.

I have configured git to sign all my commits, so it re-signs all the
patches I apply each time I rebase. I admit, this only works because I
have access to the repository itself, and as such, my key is authorized.

Regards,
Jakub Kądziołka

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

  reply	other threads:[~2020-06-19 12:26 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-15 21:03 [bug#41882] [PATCH] channels: Allow specifying per-channel --allow-downgrades in the channel file Jakub Kądziołka
2020-06-17  9:27 ` Ludovic Courtès
2020-06-17 18:50   ` Jakub Kądziołka
2020-06-18 11:59     ` Ludovic Courtès
2020-06-18 23:52   ` Jakub Kądziołka
2020-06-19  0:19     ` [bug#41882] Guix configuration file? zimoun
2020-06-19  7:39       ` Ludovic Courtès
2020-06-19  7:52     ` [bug#41882] [PATCH] channels: Allow specifying per-channel --allow-downgrades in the channel file Ludovic Courtès
2020-06-19 12:25       ` Jakub Kądziołka [this message]
2020-06-19 20:26         ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200619122528.qt3dkxk5nsu6oasc@gravity \
    --to=kuba@kadziolka.net \
    --cc=41882@debbugs.gnu.org \
    --cc=ludo@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.