git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Brett Porter <porter@devrts.com>
To: git@vger.kernel.org
Subject: stable as subset of develop
Date: Fri, 26 Aug 2016 22:29:49 -0400	[thread overview]
Message-ID: <57C0FB1D.9070206@devrts.com> (raw)


In a small group, develop is the branch where all fixes/additions/... from topic
branches are merged rather dynamically. Thorough testing of commits may lag behind,
but when we think one is a pretty good commit we want to identify it as (at least
relatively) the latest stable. We could tag it, but we would like these stable commits to
be a branch in the sense that each commit points back to a previous commit.

Merging from a development branch commit to stable isn't quite what we want. It seems
more like:

   checkout the new good development commit
   change HEAD to the head of the stable branch
   git add --all
   git commit
   (maybe tag the new commit with the hash of the chosen development commit)

Will that work (one thing beyond my current understanding is if there are index complications)?
Other ideas?

This could help with applying successively more intense testing over time and chase down
where problems arose.

             reply	other threads:[~2016-08-27  2:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-27  2:29 Brett Porter [this message]
2016-08-27  7:55 ` stable as subset of develop Jakub Narębski
2016-08-27 13:17   ` Brett Porter
2016-08-27 15:46     ` Jakub Narębski

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=57C0FB1D.9070206@devrts.com \
    --to=porter@devrts.com \
    --cc=git@vger.kernel.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.
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 NNTP newsgroup(s).