Is there a way to use maven to automate the reintegration of object branches?

Question

Say you have a project that uses maven and a subversion repository. It consists of a fairly large number of modules. Until now, development has been going on in the trunk, but now function branches should appear. This should be as painless as possible, given that all developers on the team should start using feature branches.

So, to create a branch, you use the release plugin, which conveniently creates a branch for you, correctly changes the version numbers of all modules, and even updates the section <scm>in the parent folder.

Now, if you want to reintegrate the function branch into the trunk, there are no corresponding functions in the release plugin - you need to do everything manually:

• Merge with the flag reintegrate
• Change version number on all estates
• Change the partition <scm>manually
• Fix

This is not only cumbersome, but also prone to errors if it is done manually each time (and this can be frequent with the extensional use of function branches). I know that at least the second point could be automated with release:update-versionsor version:set, but there should be more, right? What am I missing?

Answer 1

There is no really good way to do this with the maven release plugin. It is best to do a merge using only a subversive operation (merging a function into a trunk), and then eventually release the trunk again.