FreeBSD project and subversion.

FreeBSD has moved to Subversion a few years ago and it's worked very,
very well for us.

The one area where we are having issues is merging code from project
branches back into trunk.

The typical workflow is:
   1) create project branch.
   2) code code code.
   3) sync from HEAD (this works great).
   4) repeat steps 2+3 until feature is complete.
   5) svn diff and apply to head then commit.

Is there a way to do 5 automatically?

I think the worry is mergeinfo from the project branch coming back into
HEAD.

Any tips would be appreciated.

thank you,
-Alfred
Received on 2013-01-31 17:46:06 CET