From: Junio C Hamano <gitster@pobox•com>
To: "Kyle J. McKay" <mackyle@gmail•com>
Cc: Git Mailing List <git@vger•kernel.org>
Subject: Re: Any chance for a Git v2.1.5 release?
Date: Thu, 26 Feb 2015 15:51:57 -0800 [thread overview]
Message-ID: <xmqqpp8wjko2.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <35E11B78-6FF8-41DE-BBF5-8978DA2F87A6@gmail.com> (Kyle J. McKay's message of "Thu, 26 Feb 2015 15:38:51 -0800")
"Kyle J. McKay" <mackyle@gmail•com> writes:
>> After finishing 2.3.0 release, at some point while 'master' is still
>> at 2.3.0, something like this would happen:
>>
>> $ git branch -m maint maint-2.2
>> $ git branch maint master
>
> So the reason I don't notice force-updates to maint when this happens
> is because of the "Sync with maint" commits that make sure the new
> maint contains the old one.
I could also do
git branch maint-2.2 maint
git push . master:maint ;# not +master:maint
to make sure that I won't rewind 'maint', but this works because
'master' is designed to be always a super-set of 'maint'.
> If I were to keep a maint-lts branch somewhere I would need to cherry-
> pick topics with desired fixes that fall into that situation. That's
> what I expected but when you mentioned down merging the fixes I wanted
> to make sure I wasn't overlooking something.
Yup. I _can_ become sloppy especially late in the release cycle and
end up doing something silly like this:
- Fork km/svn-fix from somewhere it _could_ be merged to 'maint'
(e.g. "the last big release", e.g. v2.3.0).
- Merge km/svn-fix to 'master' early in a cycle;
- A mistake is found in the topic late in the cycle; as the next
release will happen soon _anyway_, and I do not happen to
consider km/svn-fix is so important a fix to be merged to
'maint', I apply a fix-up patch directly on top of 'master';
- A release candidate is tagged from 'master'.
Then even though you can easily grab a broken-out tree at
github.com:gitster/git, km/svn-fix topic alone cannot be merged to
'maint' as it would lack the late fix. I've been trying to be
careful but I cannot promise to be perfect X-<.
next prev parent reply other threads:[~2015-02-26 23:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <C5211E53-8905-41C9-9D28-26D7BB51E76A@gmail.com>
[not found] ` <xmqqk2z7qe8s.fsf@gitster.dls.corp.google.com>
2015-02-25 0:55 ` Any chance for a Git v2.1.5 release? Kyle J. McKay
2015-02-25 5:13 ` Junio C Hamano
2015-02-26 7:40 ` Kyle J. McKay
2015-02-26 20:54 ` Junio C Hamano
2015-02-26 23:38 ` Kyle J. McKay
2015-02-26 23:51 ` Junio C Hamano [this message]
2015-02-27 22:49 ` Philip Oakley
2015-03-12 1:23 ` Kyle J. McKay
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=xmqqpp8wjko2.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=mackyle@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox