direct merging from remore repository/working copy vs svn_load_dirs.pl + merge

Hi,

I read the documentqtion and the FAQ, subject :
" How can I maintain a modified version (a "vendor branch") of third-party software using Subversion?"

My software is OFBiz (Apache), an ERP with a lot of files, and its code is hosted in a remote Subversion repository.
The personnal devolpment covers around 5 - 10 % of the trunk.

In order to update the trunk and merge it (1 or 2 times a month) with my personal development,
what is the best to use ?

svn_load_dirs.pl ...
+
svn merge ...

or

svn merge -r XXX:YYY http://svn.apache.org/repos/asf/ofbiz/trunk customWorkingCopy

How can you import the first official trunk ?
svn export ... officialWorkingCopy
+
svn import officialWorkingCopy svn://localhost/

Thanks

Eric
Received on 2008-05-26 23:49:35 CEST