Hello All,
I just merged the trunk rev 173647 into MELT branch 173652:
2011-05-11 Basile Starynkevitch <bas...@starynkevitch.net>
MELT branch merged with trunk rev 173647 using svnmerge
That was quite a massive merge. The previous time trunk was merged into MELT
branch was
2011-03-14 Basile Starynkevitch <bas...@starynkevitch.net>
MELT branch merged with trunk rev 170941
>From a coding point of view, today's merge was quite easy (I only had to add
one line into gengtype.c). However, it seems that svn commit (aftere the
merge) failed twice to work (wih a message similar to db/melt-branch/....
out of date; I forgot the details). And svnmerge (I am using the svnmerge
python scripts) took each time more than two hours (real time).
Do you have any hints to avoid svn "failure" when merging (more precisely
when commiting the massive changes)?
Regards.
--
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 mines, sont seulement les miennes} ***
