2013/5/29 Darren Garvey
On 29 May 2013 11:47, Christopher Kormanyos
wrote: What is your advice for a project (say mine) where a student might contribute, say, 10 files over the course of the project to Boost.Math, whereby math consists of hundreds of files? The GSoC files under construction are to be deeply nested within Boost.Math and can not be used without much of Boost.
How should the student merge in order to check operation with trunk? With a merge tool? Which one? Do we really have to copy files back and forth? or is there a better way?
I am so rank idiot here! Does each student need to make a carbon copy of trunk in their GSoC repo?
I'm a little lost here and request guidance.
Daniel knows better about whether this is a sensible option, but if you chose to go down the git route you could use the modularised boost repo:
1. Set up a github account 2. Fork https://github.com/boostorg/math into your own repo
That would be great right? Unfortunately this is not an option. The modularization is still work in progress. Each time we make changes to the the modularization tool, it will force-push to this repository. It's history will be completely rewritten and will not be common anymore with your clone. As a consequence, you will not be able to merge the changes. Therefore: DON'T clone or fork the repositories at https://github.com/boostorg/ https://github.com/boostorg/math 3. Hack and review changes on the fork
4. Changes that reach a production-ready state could be sent as pull-requests to the main repo. *
* This bit might not work yet. Even if it doesn't, patches could be created from the git repo and applied manually to the boost svn repo by a Boost.Math author.
Cheers,
Darren
_______________________________________________ Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost