On 06/10/18 23:08, Igal Sapir wrote: > I am rather new to SVN, and actually use it mostly via GIT, i.e. `git svn > rebase` and `git svn dcommit`. > > What is the best way to backport specific patches from trunk to 8.5, 7.0, > etc.? Patch utility? SVN Merge? GIT cherry-pick (though the git mirrors > have a separate repos which adds some complexity I think) > > I'd appreciate any tips that will point me in the right direction, or if > anyone can share their workflow.
I use svn for backports. I use the following scripts. The first to merge from trunk to 8.5.x, the second to merge from 8.5.x to 7.0.x. I `cd` into the root of the repo for the version I want to merge to and then call the script with the revision of the commit I want to back-port. HTH, Mark mark@study04:~/bin$ cat tc-merge.sh #!/bin/sh svn up svn merge -c $1 https://svn.apache.org/repos/asf/tomcat/trunk mark@study04:~/bin$ cat tc85-merge.sh #!/bin/sh svn up svn merge -c $1 https://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk > > Thanks, > > Igal > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
