Trunk merged into fortran-dev branch

[Basile Starynkevitch]

On Sun, 26 Sep 2010 08:34:43 -0700
Jerry DeLisle <jvdelisle@frontier.com> wrote:

> Merging r163873 through r164609 from trunk.


What is the best way to merge the trunk into a branch?

I regularily do svnmerge merge to merge trunk into GCC MELT, but
sometimes strange things happens (i.e. I have to svn add new trunk
files manually into GCC MELT).  Very often, it is ok, but I don't
understand when and how it goes wrong!

So what tool or script or human procedure did you use to merge trunk
into fortran-dev?

Cheers

-- 
Basile STARYNKEVITCH         http://starynkevitch.net/Basile/
email: basile<at>starynkevitch<dot>net mobile: +33 6 8501 2359
8, rue de la Faiencerie, 92340 Bourg La Reine, France
*** opinions {are only mine, sont seulement les miennes} ***