I have a question for you. Are you 1.2 changes different than the 1.0
changes? Because if they aren't, then it is easier to merge if you do
not put them in 1.2 as well. Check Adam's wiki about merging the
branches. I've done one merge, and it is easiest if you don't put the
change in both, because there could be slight differences, like spaces,
that would cause a merge conflict and that's a pain to go through. There
were a few checkins to both trunk and 1.2 in the past few weeks and this
exact scenario happened. The same fix was in both, but one had different
spacing.
- Jeanne
Andrew Robinson wrote:
Vote:
Creation of https://svn.apache.org/repos/asf/myfaces/trinidad/trunk_1.2.x/
Justification:
Once again trinidad lacking a trunk for 1.2 is giving me heartburn.
I have been making changes to 1.0.5 and to be nice, I wanted to put
them into 1.2 as well, but of course there is no home for 1.2.5 yet.
Unlike the last time this was brought up, we now have an existing
example as an argument to use as a standard:
https://svn.apache.org/repos/asf/myfaces/core/trunk_1.2.x/
If it is good enough for core, should it not also be good enough for trinidad?
Since "https://svn.apache.org/repos/asf/myfaces/trinidad/trunk/"; would
remain untouched, this should remove any debates over JSF not being
supported.
Benefits:
1) 1.2 snapshots possible with continuum
2) 1.2 is kept up to date
3) easier merge during 1.2 release time and hopefully as a result a
more stable product
-Andrew
