On Thu, May 22, 2008 at 11:24 AM, Philipp Bracher <[email protected]> wrote: > Ups, I thought it has been clear enough that I will release in the morning.
don't you usually end up doing that on late evening? ;) > But being a nice person I will release 3.5.6 ;-) and 3.5.7 unfortunately, I saw the comments :( anyway: you can get a chance to try svnmerge for 3.5.7: grab the python script, do your changes on trunk and then run: svnmerge avail --log in the directory where you checked out the branch. This will list all the revisions, do you choice and run svnmerge merge -r1234,1235 to merge revisions (1234 and 1235 in this example), or svnmerge block -r1234,1235 to mark revisions that should never be merged to trunk svn commit -F svnmerge-commit-message.txt will then commit your changes with a nice auto-generated commit message (just a "30 seconds svnmerge how to" to let you start without having to worry reading TFM, I am sure you will enjoy it) fabrizio ---------------------------------------------------------------- for list details see http://documentation.magnolia.info/ ----------------------------------------------------------------
