[Gimp-web] SVN branches: v2.4/trunk or trunk/v2.2?

[Raphaël Quinet]

It is probably too late to mention this, but I am wondering if the way
we are working right now on the web site (using the v2.4 branch) is
the best one.  Instead of having www.gimp.org using the trunk and
next.gimp.org using the v2.4 branch, wouldn't it be better to have
www.gimp.org using a "stable" branch v2.2 while next.gimp.org uses the
trunk where all development would take place?

I am a bit concerned about what will happen when we merge the v2.4
branch into the trunk.  I only have a limited experience with merges
in SVN and so far I only tried to merge two branches instead of
merging a branch back into the trunk.  But my experience was that all
files got a new timestamp and log entry for the merge, which is not
ideal when some files have not changed at all.  Other revision control
systems that I used did not have the same problems.

Does anybody have more experience with SVN merges?  Can we safely
continue working in the v2.4 branch and expect a minimal impact when
we merge, or should we consider creating a v2.2 branch and moving our
current work to the trunk before there are too many changes?

-Raphaël