I've created a 'working-maven2' branch off the trunk today to start on converting to maven for the build management. I'm trying out svnmerge http://www.orcaware.com/svn/wiki/Svnmerge.py a tool that is supposed to help ease some of the issues involved in branching and merging in SVN. I would ask if you are going to be merging in either direction on the 'working-maven2' branch that you use this tool. Other activity on uPortal 2 doesn't need to worry about this.
-Eric
smime.p7s
Description: S/MIME Cryptographic Signature
