From: David Bremner <david@tethera.net>
To: Jameson Graef Rollins <jrollins@finestructure.net>,
Pieter Praet <pieter@praet.org>,
notmuch@notmuchmail.org
Subject: Re: revised patch for gmime init, with test.
Date: Fri, 13 Jan 2012 21:31:05 -0400 [thread overview]
Message-ID: <87pqenjciu.fsf@zancas.localnet> (raw)
In-Reply-To: <87ty3ziau7.fsf@servo.finestructure.net>
On Fri, 13 Jan 2012 12:52:48 -0800, Jameson Graef Rollins <jrollins@finestructure.net> wrote:
>
> Doesn't everything need to be merged into master eventually anyway? It
> seems to me that unless it's a change that very narrowly targeting an
> issue in a release branch that is not an issue in master, every patch
> will ultimately need to be applied to both. It doesn't really make
> sense to me to apply a change to one branch and not the other, if they
> will eventually need to be applied to both anyway.
The following two sequences of commands apply the same changes, but
result in a different history graph.
1) notmuch checkout release && git am patch && \
notmuch checkout master && git cherry-pick release
2) notmuch checkout release && git am patch && \
notmuch checkout master && git merge release
well, they apply the same changes if release was an ancestor of master
when the they both began.
next prev parent reply other threads:[~2012-01-14 1:31 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-30 0:57 Segmentation fault at gmime-iconv with python binding Kazuo Teramoto
2011-12-30 14:58 ` David Bremner
2011-12-30 21:58 ` [PATCH 0/2] Multiples calls of g_mime_init Kazuo Teramoto
2011-12-30 21:58 ` [PATCH 1/2] lib: Remove unnecessary checks when calling g_mime_init Kazuo Teramoto
2011-12-31 2:55 ` David Bremner
2011-12-31 3:07 ` Kazuo Teramoto
2011-12-31 4:45 ` Austin Clements
2012-01-21 13:25 ` David Bremner
2012-01-21 13:32 ` Kazuo Teramoto
2011-12-30 21:58 ` [PATCH 2/2] lib: call g_mime_init from notmuch_database_open Kazuo Teramoto
2011-12-31 3:02 ` David Bremner
2011-12-31 4:37 ` [PATCH] lib: call g_mime_init() from notmuch_database_open() Kazuo Teramoto
2011-12-31 4:37 ` Kazuo Teramoto
2012-01-01 3:22 ` revised patch for gmime init, with test David Bremner
2012-01-01 3:22 ` [PATCH v2 1/3] test: use file based comparison for search '*' test David Bremner
2012-01-01 3:22 ` [PATCH v2 2/3] test: add two new messages to corpus with iso-8859-1 encoding David Bremner
2012-01-01 3:22 ` [PATCH v2 3/3] lib: call g_mime_init() from notmuch_database_open() David Bremner
2012-01-12 17:25 ` revised patch for gmime init, with test Pieter Praet
2012-01-13 3:46 ` David Bremner
2012-01-13 9:05 ` David Bremner
2012-01-13 20:52 ` Jameson Graef Rollins
2012-01-14 1:31 ` David Bremner [this message]
2012-01-14 8:54 ` Pieter Praet
2012-01-14 8:51 ` Pieter Praet
2012-01-02 12:56 ` [PATCH 2/2] lib: call g_mime_init from notmuch_database_open Tomi Ollila
2011-12-31 1:16 ` [PATCH 0/2] Multiples calls of g_mime_init Patrick Totzke
2011-12-31 1:30 ` Kazuo Teramoto
2012-01-02 15:43 ` Segmentation fault at gmime-iconv with python binding Sebastian Spaeth
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://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87pqenjciu.fsf@zancas.localnet \
--to=david@tethera.net \
--cc=jrollins@finestructure.net \
--cc=notmuch@notmuchmail.org \
--cc=pieter@praet.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://yhetil.org/notmuch.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).