[ET Trac] [Einstein Toolkit] #1949: provide floating branch to "current release" and links to it

Einstein Toolkit trac-noreply at einsteintoolkit.org
Mon Aug 22 11:01:27 CDT 2016

#1949: provide floating branch to "current release" and links to it
  Reporter:  rhaas        |       Owner:                     
      Type:  enhancement  |      Status:  new                
  Priority:  minor        |   Milestone:                     
 Component:  Other        |     Version:  development version
Resolution:               |    Keywords:  EinsteinToolkit    

Comment (by rhaas):

 This was discussed in the ET call
 and a regular branch seems to be impossible to maintain due to conflicts
 occurring during git pull if two releases each contain changes the other
 does not.

 A release tag on the manifest would likely work, with the proposed update
 scheme being:
 bin/GetComponents -u --root .

 If we really want branches and the ability to do a git pull then one would
 have to update the release branch along these lines:

 git checkout release
 git diff release..ET_2016_11 | git apply --index
 git commit -m 'update release branch'
 git merge ET_2016_11 -m 'merge with new release'

 which basically commits a single commit with the difference between
 releases onto the release branch. Not a very nice solution.

 In light of this, a tag on manifest would be better.

Ticket URL: <https://trac.einsteintoolkit.org/ticket/1949#comment:6>
Einstein Toolkit <http://einsteintoolkit.org>
The Einstein Toolkit

More information about the Trac mailing list