automatic merge - quick question

Hi All

We like to perform frequent automatic svn merges between our trunk and
our branches but we don't have much experience with svn merging.
We read that Svnmerge.py could help but we weren't sure as we read
elsewhere that svn 1.6 does merges similar to Svnmerge.py, and so
Svnmerge.py should no longer be needed.
On the other hard, we also read that

svn merge
                Does per-file merging
                Does not block revisions, need to fake it
svnmerge.py
                No per-file merge tracking, only per revision
                svnmerge.py block and unblock supported

We are also not sure what that "blocking" feature does or what it means.

We like to include this automatic and frequent merging process as part
of our daily Hudson job.
So we arent sure which advice to take and need more help on how to
reach our final goal - automatic and frequent merging process as part
of our daily Hudson job.

We like to hear your advice and suggestions.

Thank you all.
Sincerely
Received on 2013-03-20 06:44:21 CET