merging of trunk to fortran-dev?

[Steve Kargl]

On Tue, Dec 29, 2009 at 11:11:51PM +0100, Tobias Burnus wrote:
> 
> The question is just what is more convenient:
> a) A shared development branch
> b) Having several, separate development branches
> 
> (a) has the advantage that it is easier to test a single additional
> branch than several branches. (b) has the advantage that merging to the
> trunk is easier. If the patches are orthogonal, i.e. they touch separate
> places (better: different files, best: different directories), I would
> go for a single branch for both. Otherwise, I would suggest to create
> another branch.
> 
> Tobias
> 
> PS: BTW - newer svnmerge.py scripts call now "svn merge".

According to the gcc wiki, svnmerge and 'svn merge' maintain
different metadata format/information.  This may have changed
and the wiki may be out of date.

> PPS: I have just updated fortran-dev to the branch: 155317-155509 (as
> Rev. 155511).

I'm in the process of seeing if I can merge everything from
trunk into a fresh checkout of the old branch.  Yes, I'm
using svnmerge to try this feat.  Can you hold off on touching
the branch until my experiment is completed?

> PPPS: At some point I would like to start developing Coarrays on a
> branch - at least if others are also interested working on it. Otherwise
> having the changes locally such that a "svn up" is enough to update to
> the latest trunk is simpler.

For these large projects, I'm leaning toward separate branches
if there is little impact on system resources (ie., diskspace).
Each branch should maintain it's own ChangeLog.somelabel file
and this file would be merged into trunk when the project is
merged.  It simply provides a clean history to follow the 
development.


-- 
Steve