move branch->trunk or merge?

Hi all,

what is the appropriate method if there were only minor changes in
the trunk, but many changes in a branch all to be merged to the
trunk:

I could merge the few trunk changes to the branch and move (rename)
the branch to the trunk, resulting in much less (duplicate) merging,

or make a big merge branch -> trunk. In this case I wonder whether I
should repeat all commit comments or only say "merged all changes of
branch foo".

As a SVN newbie I can't see what's better (safe, clear, efficient).

Any comments?

TIA,

Oliver

-- 
Oliver Betz, Muenchen
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org