Re: Applying patches from gmane can be dangerous.
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 7, 2008, 09:08 UTC
- Message-ID
- <7vy79xnnfq.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <alpine.LFD.1.00.0802062327350.2732@xanadu.home>
Nicolas Pitre <nico@cam.org> writes:
Show 9 quoted lines
> On Wed, 6 Feb 2008, Junio C Hamano wrote: > >> ... >> It already is part of 'next', and we have the policy of not >> rewinding 'next', so the record of this mistake will >> unfortunately be with us forever. Sorry, Brian, Dscho and >> Steffen. > > Maybe you can make an exception for this time? A single
That's very tempting.
There currently are 1176 commits in 'next' that are not in 'master'. Among them, 1100 or so of them will never be. They are merges of topics that have long graduated to 'master', or upmerge of 'master' into 'next'.
If we rebuild an equivalent of 'next', starting with 'master' and merging the still-cooking topics today, the result is only 70 commits ahead of 'master'. Among of them, 16 are merges.
In other words, 'next' will go down from v1.5.4-1200-gXXXXXX to v1.5.4-70-gXXXXXX all of a sudden, if we decide to do so.
People who follow 'next' hopefully know what goes on the list, so perhaps we could revise the "never rewind" rule to read "it will not rewind during the regular cycle, but it will be rebuilt once each feature release, immediately after release."
Hmmmmmmmm...