Re: Branch Merging

[Tobias Burnus <burnus at net-b dot de>]

Jerry DeLisle wrote:
> What are our plans to merge the fortran-dev and fortran-exp branches
> back into trunk?

Fortran-dev has known regressions (see bugzilla); Paul is working on those.

> I am thinking the way to do this is:
>
> Merge trunk to exp, test, and commit to branch.
> Merge exp branch to trunk, test, and commit to trunk.

I think doing a merge into the branch is good; however, I think one
should merge from the branch to the trunk via patches - SVN does not
seem to be good in tracking branch-to-trunk merges. (At least it wasn't
maybe it has meanwhile improved.)
Additionally, one should include the ChangeLog.fortran-* items in the
normal ChangeLog. And the patch (gzipped if needed) could be posted
before or after committal to the mailing list.

I am currently running a diff between
svn://gcc.gnu.org/svn/gcc/trunk@157996 and
svn://gcc.gnu.org/svn/gcc/branches/fortran-exp to have another look at
the changes.

Tobias

PS: diffstat shows:

 ChangeLog.fortran-exp |  305 ++++++++
 Make-lang.in          |    6
 arith.c               |  294 ++------
 arith.h               |    3
 array.c               |  444 ++----------
 check.c               |   33
 constructor.c         |  259 +++++++
 constructor.h         |   92 ++
 data.c                |  250 +-----
 decl.c                |   92 +-
 dependency.c          |    7
 dump-parse-tree.c     |    8
 expr.c                |  930 ++++++++++++++-----------
 gfortran.h            |   44 -
 io.c                  |   24
 iresolve.c            |   34
 match.c               |   17
 matchexp.c            |   32
 module.c              |   21
 primary.c             |   64 -
 resolve.c             |   46 -
 simplify.c            | 1825
++++++++++++++++++++------------------------------
 symbol.c              |   44 -
 target-memory.c       |  111 +--
 trans-array.c         |   69 +
 trans-array.h         |    2
 trans-const.c         |    5
 trans-decl.c          |    7
 trans-expr.c          |   35
 trans-intrinsic.c     |    6
 trans-io.c            |   19
 trans.h               |    2
 32 files changed, 2496 insertions(+), 2634 deletions(-)