Thanks Martin, I've been seeing you going through the branches and am glad that SVN merge-info is making SVN merging and branch management a bit easier :)
I'll probably work in the JDK6 branch (besides trunk) since I can't do anything with JDK7 as of yet as I'm still on Snow Leopard (10.6.8) for my Mac. Cheers, Chris On Oct 6, 2012, at 7:41 AM, Martin Desruisseaux wrote: > Hello all > > I created the JDK6 and JDK7 branches yesterday and have experimented some > merges. The new SVN "merge info" mechanism (since Subversion 1.5) worked very > well up to date. I documented here the branches and the procedures for making > merges: > > https://builds.apache.org/job/sis-trunk/site/branches.html > > Please feel free to edit if you want to change anything or fix my broken > English. If someone choose to edit a file, he should be able to do that on > whatever branch of its choice between trunk, JDK6 and JDK7. It will be an > opportunity for me to test merging again. > > Regards, > > Martin > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Chris Mattmann, Ph.D. Senior Computer Scientist NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA Office: 171-266B, Mailstop: 171-246 Email: [email protected] WWW: http://sunset.usc.edu/~mattmann/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Adjunct Assistant Professor, Computer Science Department University of Southern California, Los Angeles, CA 90089 USA ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
