-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Guillaume Melquiond schrieb: >> Would it be an idea to fork 1.6 about a day after tagging so commits >> which are needed in both trunk and 1.6 can be applied to both without >> merging? > > I'm not sure I understand. If the patches are needed for 1.6, then > let's just wait one more day before tagging. No need to rush a crappy > release, if you will have a fixed version by next Monday.
I think this is generally about smaller stringchanges that will make the meaning cleaner and such. All other changes should already be in. And yeah, those "tiny little changes" like eg reordering campaigns after "real" difficulty" require string changes and are probably to be done in both, 1.6 as well as trunk. So those are to wait till after the release. I don't think we will do this for "patches that are just late". Some deadline has to be set or we won't ever get a stable version out since there is always the "oh, wait, just one more thing"-problem. So unless someone comes up with a *real* blocker, the deadline is Wednesday. Regarding keeping 1.6 and trunk together a little longer: Not so sure. That is if we directly branch, we could eg apply the lua patches and other intrusive stuff like this. Or we could keep 1.6 and trunk the same for a little after the announcement so that "late spotted bugs" get fixed in both. Personally I'd say that we should best wait one day and then branch 1.6 off. This way the "small and simple" changes that could not be committed before (stringfreeze ;) ) can get in. And it won't delay the start of "the new trunk" by much either. Regarding commits by students and them getting svn access: I am *not* talking about giving them commit access right away. It is just that boucman asked about this, so that he can commit the patches that are ready. And for those students the same rule will apply as for all other "new devs", too: Two meaningful patches and you got access. If the patches are directly ready for committing, get them in, if not, help to polish them. Just the normal stuff, no extra rules... Cheers, Nils Kneuper aka Ivanovic -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkm//80ACgkQfFda9thizwUmfwCfUPwU3ZGkC8q/TNopt79sOdcm Nw8An07os0hxsKC/DIwzvMpjJjsLQD7S =PX4+ -----END PGP SIGNATURE----- _______________________________________________ Wesnoth-dev mailing list [email protected] https://mail.gna.org/listinfo/wesnoth-dev
