On Tue, 2008-10-28 at 12:27 -0400, Joe Attardi wrote: > I am trying to port my fix for XCF-2987 to 3.10.3 and am confused on > which branch I should be working in. There is a 3.10 branch and a 3.10.1 > branch. > > Which is the right one to use?
Looking at the log, I see: $ svn log -v --stop-on-copy https://sipxecs.sipfoundry.org/rep/sipXecs/branches/3.10.1 ------------------------------------------------------------------------ r12339 | mardy | 2008-04-17 09:43:21 -0400 (Thu, 17 Apr 2008) | 1 line Changed paths: M /branches/3.10.1/lib/java-ibm/Makefile.am Updated JVM to 1.5.0.7-1 ------------------------------------------------------------------------ r12331 | mardy | 2008-04-16 15:01:47 -0400 (Wed, 16 Apr 2008) | 1 line Changed paths: M /branches/3.10.1/sipXacd/configure.ac M /branches/3.10.1/sipXcallLib/configure.ac M /branches/3.10.1/sipXcommserverLib/configure.ac M /branches/3.10.1/sipXconfig/configure.ac M /branches/3.10.1/sipXecs/configure.ac M /branches/3.10.1/sipXmediaAdapterLib/configure.ac M /branches/3.10.1/sipXmediaLib/configure.ac M /branches/3.10.1/sipXpbx/configure.ac M /branches/3.10.1/sipXportLib/configure.ac M /branches/3.10.1/sipXproxy/configure.ac M /branches/3.10.1/sipXpublisher/configure.ac M /branches/3.10.1/sipXregistry/configure.ac M /branches/3.10.1/sipXtackLib/configure.ac M /branches/3.10.1/sipXtools/configure.ac M /branches/3.10.1/sipXvxml/configure.ac Set revision to '3.10.1.1' ------------------------------------------------------------------------ r12329 | mardy | 2008-04-16 14:42:08 -0400 (Wed, 16 Apr 2008) | 3 lines Changed paths: M /branches/3.10.1 Initialized merge tracking via "svnmerge" with revisions "1-12233" from https://sipxecs.sipfoundry.org/rep/sipXecs/branches/3.10 ------------------------------------------------------------------------ r12328 | mardy | 2008-04-16 14:33:44 -0400 (Wed, 16 Apr 2008) | 1 line Changed paths: A /branches/3.10.1 (from /branches/3.10:12233) 3.10.1 branch ------------------------------------------------------------------------ $ There don't appear to be any changes of substance on the 3.10.1 branch, other than revising the JVM. So I believe that 3.10.1 is essentially a tag for the 3.10.1 deliverable. It also looks like */configure.ac on the 3.10 branch shows version 3.10.2, whereas the 3.10.1 branch shows version 3.10.1.1. Dale _______________________________________________ sipx-dev mailing list [email protected] List Archive: http://list.sipfoundry.org/archive/sipx-dev Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev
