CODEWITHSUNDEEP
svnpatchtrunk
Massimo Ugues
Massimo Ugues

Reputation: 4463

SVN rebase branch from trunk

Hallo all. I have a java project using SVN as scm. I have the trunk line where I have the PRODUCTION_LINE and some branches for the next releases.

When I found a bug in production I fix it on trunk and release the software. I would like to take the fix also on the branches without closing them. Is it possibile?

Kind regards Massimo

Upvotes: 1

Views: 5537

Answers (2)

qbolec
qbolec

Reputation: 5134

Disclaimer : I am the author of the solution. https://github.com/qbolec/svn_rebase

Upvotes: 0

mrembisz
mrembisz

Reputation: 12880

If you really need the fix in your development branches, just merge the fix using:

svn merge -rXXX:YYY <path_to_trunk>

where XXX is revision prior to fixes and YYY is the last of the fix commits.

Usually you should not need this because development branches contain changes that are going to be merged back into trunk which already has the fix.

Upvotes: 2

Related Questions