From: Leo Famulari <leo@famulari.name>
To: Mark H Weaver <mhw@netris.org>
Cc: guix-devel@gnu.org
Subject: Re: Ungrafting
Date: Mon, 2 May 2016 14:39:43 -0400 [thread overview]
Message-ID: <20160502183943.GD10321@jasmine> (raw)
In-Reply-To: <87shy0vb11.fsf@netris.org>
On Mon, May 02, 2016 at 09:34:34AM -0400, Mark H Weaver wrote:
> Leo Famulari <leo@famulari.name> writes:
> > 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.
> 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?
I'm having a hard time seeing the difference between our suggestions.
Can you clarify yours?
To give more detail, here is what I was suggesting:
1) Apply a graft to master.
2) Merge master into core-updates.
3) Apply a commit to core-updates that "un-does" the graft and applies
the bug fix without a graft.
Apologies if my original email was unclear.
prev parent reply other threads:[~2016-05-02 18:40 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 ` Ungrafting Ludovic Courtès
2016-05-02 18:39 ` Leo Famulari [this message]
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=20160502183943.GD10321@jasmine \
--to=leo@famulari.name \
--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 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.