Short answer: yes Long answer: The 1.2 trunk should now have all the 1.0 trunk changes up to the tag (revision 601018)
All commits after revision 601018 on the trunk should also be applied to the trunk_1.2.x. Before one person handled all the changes to 1.2.x, which is more error prone and harder for that person. Now the person making the change is responsible for keeping 1.2 up to date with the main trunk. The tag was my way of recording the cut-off point where after the tag there are no "automated" merges from 1.0.x to 1.2.x. It is now a committer's decision to decide if a change should go in 1.0, 1.2 or both. -Andrew On Dec 4, 2007 11:35 AM, Matthias Wessendorf <[EMAIL PROTECTED]> wrote: > So, > > basically, what I did yesterday, is moved to "12_x_trunk" by you; > what I do tomorrow, I have to do it twice (real trunk and the "special > trunk")? > > So, the new TAG is only for you, were you "collect" your merges ? > Or what? > > -M > > > On Dec 4, 2007 6:55 PM, Andrew Robinson <[EMAIL PROTECTED]> wrote: > > Wanted to make sure I have everyone's attention. > > > > There is a new tag: > > > > https://svn.apache.org/repos/asf/myfaces/trinidad/tags/trinidad-1.0.5-SNAPSHOT_to_trinidad-1.2.5-SNAPSHOT > > > > all changes to the trunk (1.0.5-SNAPSHOT) should be applied to the 1.2 > > trunk by ***committers*** now. > > > > I will merge the changes from the inception of the 1.0.5 trunk to the > > new tag (revision 601018). From now on, there will not be any more ppl > > handling the merging, it is the developers responsibility. > > > > Reminder, the new trunk is: > > > > https://svn.apache.org/repos/asf/myfaces/trinidad/trunk_1.2.x > > > > Thanks! > > > > -Andrew > > > > > > -- > Matthias Wessendorf > > further stuff: > blog: http://matthiaswessendorf.wordpress.com/ > sessions: http://www.slideshare.net/mwessendorf > mail: matzew-at-apache-dot-org >
