From: ludo@gnu.org (Ludovic Courtès)
To: Mark H Weaver <mhw@netris.org>
Cc: guix-devel@gnu.org
Subject: Re: Ungrafting
Date: Mon, 02 May 2016 17:54:37 +0200 [thread overview]
Message-ID: <87shy0foaq.fsf@gnu.org> (raw)
In-Reply-To: <87shy0vb11.fsf@netris.org> (Mark H. Weaver's message of "Mon, 02 May 2016 09:34:34 -0400")
Mark H Weaver <mhw@netris.org> skribis:
> Leo Famulari <leo@famulari.name> writes:
>
>> When committing a bug fix with a graft, I think it would be a good idea
>> to follow up on some other branch with a commit that makes the same
>> change without a graft.
>>
>> Core-updates was suggested on IRC. This would mean that after each graft
>> commit, master would need to be merged into core-updates, and then the
>> "ungrafting" patch could be applied.
>
> Merging those two will be awkward. In my experience, the result of git
> automatically merging these two commits is to update the main package
> *and* to graft it.
Good point.
> For this reason, I think it's preferable for the ungrafted commit to
> be on top of the grafted one, i.e. it should remove the graft and
> update the origin package in a single commit.
>
> In practice, this means that after applying the graft to master, master
> should be merged into core-updates before applying the ungrafting commit
> to core-updates.
>
> What do you think?
Sounds like a good workflow, yes.
Regarding builds, it’s really a scheduling problem. We have periodic
update branches (gnome-updates, python-updates, core-updates), and
Something could tell you whether a change is eligible for one of these
branches, so we could batch related changes together.
Ludo’.
next prev parent reply other threads:[~2016-05-02 15:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-01 20:20 Ungrafting Leo Famulari
2016-05-02 13:34 ` Ungrafting Mark H Weaver
2016-05-02 15:54 ` Ludovic Courtès [this message]
2016-05-02 18:39 ` Ungrafting Leo Famulari
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87shy0foaq.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=guix-devel@gnu.org \
--cc=mhw@netris.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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
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).