Versions post 3.1.0 release ?

[Cantor, Scott]

On 3/11/15, 10:02 AM, "Rod Widdowson" <rdw at steadingsoftware.com> wrote:
>
>... That of course being where git cherry pick comes into its own.  In my
>experience, as opposed to CVS and SVN where merging mostly doesn't work in
>git cherry picking mostly does; this of course has the bad side effect that
>it lulls you into a false sense of security in that something which is a
>perfect textual merge may not be functional.

Well, the problem is I don't know what to cherry pick from a feature trunk without looking at every commit to see which were just bug fixes. But...

>It looks like 3.2 is weeks away, are we really saying that if we have to do
>a 3.1.1 release we'll be saying "here is a security release, it also
>contains a whole bunch of bug fixes that you may or may not want"?  If not
>what will we be saying?  That should provide guidance as what sort of bug
>fixes we would put in.

That's a valid point. Maybe I'm making the wrong assumption about what it involves if we do branch early. It probably doesn't make sense to just roll arbitrary fixes into a security fix branch.

>Absolutely.  And for one I'd appreciate a nudge if people ever spot that I
>have broken the "function change"/"pom bump" linkage.

My C++ brain wouldn't allow me not to review every commit with that eye.

-- Scott