This is the mail archive of the
fortran@gcc.gnu.org
mailing list for the GNU Fortran project.
Bumping of libgfortran major version number and git
- From: Jerry DeLisle <jvdelisle at charter dot net>
- To: "fortran at gcc dot gnu dot org" <fortran at gcc dot gnu dot org>
- Date: Mon, 10 Oct 2016 09:09:46 -0700
- Subject: Bumping of libgfortran major version number and git
- Authentication-results: sourceware.org; auth=none
Hi all,
I plan to submit a patch for approval that will bump the libgfortran version
number and do a few cleanup things. I have the impression that we have a
consensus on this. I think it should be done before GCC 7 release.
I also think the fortran-dev branch is very close to a clean merge with trunk.
Of course I could be mistaken (IMHO)
I ran a merging test using git merge of fortran-dev and trunk. There are only
four files that need some manual conflict resolution. I would like to say that
the merge should go into trunk as soon as possible to coincide with the library
version change. I would hate to have to bump the version twice.
I don't know how many have figured out the git paradigm shift, but I have been
using it a lot. Merging is hugely simplified because it is done on local copies
of your trees. As a test, I ran a merge of trunk into fortran-dev and it took
about 15 seconds to do. That is a lot quicker than svn because it avoids the
network back and forth to do it. Merge conflicts are nicely marked.
Not a sales pitch, but I am willing to recommend it. I particularly like the git
stash feature where I can push all my current work away to a stack, update the
trunk, work on some other issue, fix it, commit it, and then pop the previous
work back which is then merged for you. This feature alone is worth the learning
curve. During dtio development I used it a lot so save things, try other
patches, discard stuff, and retrieve.
Cheers,
Jerry