All the SVN repositories in dev.openbravo.com have been migrated to Subversion 1.5. This new version has improvements over 1.4.x, specially the merge tracking [1] feature. This means it's no longer necessary to remember in which revision a branch was made.
An example basic branch/merge work cycle: 1) Create branch: svn copy https:/dev.openbravo.com/svn/openbravo/trunk https://dev.openbravo.com/svn/openbravo/branches/mybranch -m "My comment about the branch" 2) Edit files and commit in the branch. 3) Merge with trunk in the branch: svn merge https:/dev.openbravo.com/svn/openbravo/trunk 4) Merge the branch in the trunk: svn merge --reintegrate https://dev.openbravo.com/svn/branches/mybranch To benefit from this feature it is necessary to update your SVN client to 1.5: * Linux and other UNIX users can compile SVN 1.5 from sources or install the binaries provided by their package manager. -> Debian: it's already in Sid. -> FreeBSD: it's already in Ports. -> Gentoo: it's already in Portage. -> Ubuntu: there are no 1.5 official debs for Ubuntu yet. It is possible to use the Debian binaries [2]. Alternatively, compile it from sources. * Eclipse users should update Subversive to 0.7.1, or download the new Eclipse Ganymede. * Windows users can get the official 1.5 svn client or TortoiseSVN 1.5.0. Finally, a note for those using the svnmerge.py script: it is no longer necessary to use it because Subversion 1.5 provides this functionality. If you previously created a branch with this script, all the properties have been migrated to the new format, so you can drop it and use "svn merge" instead. From now on, svnmerge.py *must* not be used in dev.openbravo.com. Juan Pablo [1] http://subversion.tigris.org/merge-tracking/ [2] http://web.loose.cz/deb/ ------------------------------------------------------------------------- Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 _______________________________________________ Openbravo-development mailing list Openbravo-development@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-development
