Gnus development mailing list
 help / color / mirror / Atom feed
From: Steinar Bang <sb@dod.no>
To: ding@gnus.org
Subject: Re: Version numbering
Date: Wed, 23 Feb 2011 11:43:12 +0100	[thread overview]
Message-ID: <87fwrf116n.fsf@dod.no> (raw)
In-Reply-To: <m2r5azrqq9.fsf@ecocode.net>

>>>>> Erik Colson <eco@ecocode.net>:

> A 'release branch' which _only_ holds release commits will soon become
> a problem if one of the devs forgets this and pushes a non-release
> commit to the branch :/

It is possible to limit pushes to a branch to some users (or maybe only
one?). 

If people use rebase before pushing instead of merging then all new
commits should come chronologically after the previous head, and then it
is possible to do a reset on the release branch.

But of course, here we are talking about people messing up, and when
they do, they usually do it in spite of all safeguards you put up.

Worst case, you can delete the release branch, and create a new release
branch from some point in time on master.

On git, recovery is possible... in most cases... just keep calm, and
don't panic.





  reply	other threads:[~2011-02-23 10:43 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-21 23:07 Lars Ingebrigtsen
2011-02-21 23:27 ` Richard Riley
2011-02-21 23:31   ` Lars Ingebrigtsen
2011-02-22  7:32     ` Steinar Bang
2011-02-23  8:07       ` Lars Ingebrigtsen
2011-02-23 10:21         ` Julien Danjou
2011-02-23 10:31           ` Lars Ingebrigtsen
2011-02-23 10:44           ` Steinar Bang
2011-02-23 11:36             ` Julien Danjou
2011-02-21 23:48 ` Andreas Schwab
2011-02-22  0:01   ` Lars Ingebrigtsen
2011-02-22 15:21 ` Julien Danjou
2011-02-23  8:08   ` Lars Ingebrigtsen
2011-02-23 10:17     ` Julien Danjou
2011-02-23 10:26       ` Erik Colson
2011-02-23 10:43         ` Steinar Bang [this message]
2011-02-23 10:29       ` Lars Ingebrigtsen

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=87fwrf116n.fsf@dod.no \
    --to=sb@dod.no \
    --cc=ding@gnus.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).