discussion and development of piem
 help / color / mirror / code / Atom feed
From: Ihor Radchenko <yantar92@gmail.com>
To: Kyle Meyer <kyle@kyleam.com>
Cc: piem@inbox.kyleam.com
Subject: Applying the same patch multiple times (was: [FR] Support multiple repositories associated with the same ML)
Date: Tue, 26 Apr 2022 17:19:28 +0800	[thread overview]
Message-ID: <8735i0urq7.fsf@localhost> (raw)
In-Reply-To: <87pml6871p.fsf@kyleam.com>

Kyle Meyer <kyle@kyleam.com> writes:

>   ;; TODO: Decide how to deal with inboxes that map to more than one
>   ;; coderepo.  This is important to support for people that want to
>   ;; use a catchall inbox for small projects which they don't think
>   ;; (yet) need a dedicated address.
>   (defcustom piem-inboxes nil
> I'll plan to take a look at this soon (within the next week or two).


I also noticed one minor annoyance when I return to work on the
previously applied patch.

My starting point is the patch-containing email. Then, I run piem-am and
use the default automatically generated branch.

Expected behaviour: Silently switch to the already existing branch
unless that branch had modifications to the patch in the email. In the
latter case, either throw an error or show the changes interactively.

Observed behaviour: Because the branch already exists and the patch is
already applied, git am throws an error.

I think a more useful approach would be something like:
1. piem creates a throwaway branch and apply the patch in the email
2. piem rebases the existing branch onto that throwaway branch

That way, I can start working on a patch from email, possibly add some
followup commits and still be able to return to this WIP branch starting
from the patch email.


  reply	other threads:[~2022-04-26  9:18 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-24  7:48 [FR] Support multiple repositories associated with the same ML Ihor Radchenko
2022-04-24 22:12 ` Kyle Meyer
2022-04-26  9:19   ` Ihor Radchenko [this message]
2022-04-27  3:49     ` Applying the same patch multiple times Kyle Meyer
2022-04-27 12:46       ` Ihor Radchenko
2022-05-07 14:19         ` Kyle Meyer
2022-05-06  1:40   ` [PATCH] piem-inboxes: Support mapping inbox to multiple coderepos Kyle Meyer
2022-05-06  2:10     ` Ihor Radchenko
2022-05-06  3:28       ` Kyle Meyer
2022-05-07  5:21         ` Ihor Radchenko
2022-05-07 14:18           ` Kyle Meyer

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:

  List information: https://git.kyleam.com/

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

  git send-email \
    --in-reply-to=8735i0urq7.fsf@localhost \
    --to=yantar92@gmail.com \
    --cc=kyle@kyleam.com \
    --cc=piem@inbox.kyleam.com \


* 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 public inbox


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).