On 8/20/06, Gwyn Evans <[EMAIL PROTECTED]> wrote: > Hmm, I'm not really sure about much of this, to be honest... > > (a) I'm not sure that we should be equating 1.x development with 2.0 > development, i.e. I think the /trunk/wicket-[12].x is a bad move.
1.x development is *just* as important at the moment as 2.x development. People *are* using 1.x in production systems, and new products are being developed using that version. IMO Wicket 1.x is equally as important at the moment as 2.x. When we release 2.x final, then probably 1.x will become less important, but as long as a lot of systems won't be built upon java 1.5, Wicket 1.x is here to stay and should be kept alive. Perhaps we should add more people to our project willing to support 1.x in the future. > (b) I *really* don't like the idea of tags for a particular version > being something other than tagging the particular revision used to > create the release. I haven't proposed anything other. > (c) I'm fairly sure that this 'release branch' concept is flawed. If > we can't arrange a pause in 'commit's sufficient to make a release in > the development stream, then maybe we shouldn't be making the release > at that time. We're on different timezones, and building a release takes a lot of time: it could take a day or two to finalize a release, depending on any number of circumstances. The branch concept is perfect to make sure nothing wrong happens, and should be used accordingly. And let me repeat what I said on admin, this is *THE* way the pragmatic programmers tell you to build releases. I think committing release specifics to a development stream is an absolute wrong way of working. They also need to be rolled back after the release, adding manual effort to the process, and another possibility to make mistakes. Putting them inside a branch specific for the release, just as suggested by the pragmatic programmers, creates the possibilty for a reproducable build, minimizes the amount of work for the release builder. Martijn > > /Gwyn > > On 20/08/06, Martijn Dashorst <[EMAIL PROTECTED]> wrote: > > There has been some confusion on the branches and Wicket 1.x > > development. This document proposes a solution to this confusion, and > > asks for a vote on structure. But first a short analysis of the > > problems at hand. > > > > According to me, the root cause of this confusion is that we have > > effectively two main development streams: Wicket 1.x and Wicket 2.x. > > The Wicket 1.x main development stream happens in the branch, and 2.x > > development happens in trunk. This effectively makes it harder to > > distinguish between release branches (1.2.1 for instance) and > > development branches. > > > > To make the distinction more clear on what constitutes the main > > development streams, I propose to split our current trunk into two > > forks: wicket-1.x and wicket-2.x. The future development of Wicket > > will still remain in wicket-2.x, but for support of those already in > > production we keep the latest version of wicket-1.x up to date with > > bugfixes and backports. > > > > The solution to our problem at hand is that we should: > > 1. move trunk/ to trunk/wicket-2.x/ > > 2. move branches/WICKET_1_2/ to trunk/wicket-1.x/ > > 3. copy the specific 1.2 release moment (the actual revision when the > > 1.2 branch was created) to the branches/WICKET_1_2 directory. > > 4. copy WICKET_1_2 (the point where the branch was created) to > > tags/WICKET_1_2 > > 5. copy WICKET_1_2_1 (the point where the branch was created) to > > tags/WICKET_1_2_1 > > > > This way people can get to the bare starting point easier (look in > > tags/) or check out the branch if they want to replicate the build > > itself. > > > > The final repo directory structure would then be: > > > > svnroot/wicket/ > > branches/ > > WICKET_1_2/ <- final build for 1.2 > > WICKET_1_2_1/ <- final build for 1.2.1 > > tags/ > > WICKET_1_2/ <- marking start of 1.2 > > WICKET_1_2_1/ <- marking start of 1.2.1 > > trunk/ > > wicket-1.x/ <- main development of 1.x (1.2, 1.3, etc) > > wicket-2.x/ <- main development of 2.x (2.0, 2.1, etc) > > > > If we were to implement this, then *after* the repo repair, the 1.2.2 > > build would look like the following: > > > > 1. create tag from trunk/wicket-1.x/ : tags/WICKET_1_2_2 > > 2. copy tag to branch: branches/WICKET_1_2_2 > > 3. create release from branch, commit release changes to branch > > 4. merge improvements from WICKET_1_2_2 branch to trunk/wicket-1.x and > > trunk/wicket-2.x when applicable. > > > > So both in tags/ and branches/ WICKET_1_2_2 tags will be available, > > where the tags *mark* the release point in time on the trunk, and the > > branch will contain the artifacts particular for that release. > > > > Please vote for this proposal, committers have binding votes. The vote > > will last for 48 hours. > > > > Martijn > > > > -- > > Download Wicket 1.2.1 now! Embed Wicket components in your portals! > > -- http://wicketframework.org > > > > ------------------------------------------------------------------------- > > Using Tomcat but need to do more? Need to support web services, security? > > Get stuff done quickly with pre-integrated technology to make your job > > easier > > Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo > > http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 > > _______________________________________________ > > Wicket-develop mailing list > > Wicket-develop@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/wicket-develop > > > > > -- > Download Wicket 1.2.1 now! - http://wicketframework.org > > ------------------------------------------------------------------------- > Using Tomcat but need to do more? Need to support web services, security? > Get stuff done quickly with pre-integrated technology to make your job easier > Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo > http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 > _______________________________________________ > Wicket-develop mailing list > Wicket-develop@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/wicket-develop > -- Download Wicket 1.2.1 now! Embed Wicket components in your portals! -- http://wicketframework.org ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Wicket-develop mailing list Wicket-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wicket-develop
