Yes that it is. You can reverse integrate your dev back to main AFTER branching main to 3.4 (which you can do now in fact if you like), and it will all carry on down the v4 branch (which is just main again of course). Then we just remember that 3.4 is a development dead end once it is released (after we have all got our 3.4 development in there). Can have 3.4.1, .2 etc forever but just make bug fixes (which perforce can integrate to v4 main if it makes sense too).
Then use labels for the main. Jim > -----Original Message----- > From: antlr-dev-boun...@antlr.org [mailto:antlr-dev-boun...@antlr.org] > On Behalf Of Terence Parr > Sent: Tuesday, March 08, 2011 10:13 AM > To: ANTLR-dev Dev > Subject: Re: [antlr-dev] moving to ST v4 for ANTLR v4 release this year > > Howdy. Sounds good. So I have pull a dev branch and made STv4 code > gen changes (parrt.dev). We can now pull main to a v3 branch (from > which we get 3.4 release when ready). I can then push my STv4 stuff > back to mainline which will now become v4 main. Is this the picture: _______________________________________________ antlr-dev mailing list antlr-dev@antlr.org http://www.antlr.org/mailman/listinfo/antlr-dev
