[git workflow questions for boost]
I've discovered a couple of changes I want to see incorporated into some boost libraries. In this particular instance the modules are mpl and tools. The "best" way of doing this for me is to: use github to fork the modules in question clone the modules to my local machine make (and test) my changes push them to the the fork enter a pull request. sometime later delete the fork from github This is well described here https://help.github.com/articles/fork-a-repo So far so good. But I have a couple of questions about this. I currently have modular boost installed on my machine. It seems that I want to: delete the module in question. clone to the same spot I just deleted. do everything above. delete the module again. clone from the original? update super project? rerun b2 headers? what? - I'm sort of at a loss here. I'm sort of uncomfortable with deleting the "official" version - but it seems the right think to do. I would appreciate any observations/advice from some more experienced boosters. Robert Ramey -- View this message in context: http://boost.2283326.n4.nabble.com/git-workflow-questions-for-boost-tp466443... Sent from the Boost - Dev mailing list archive at Nabble.com.
Robert Ramey wrote:
I've discovered a couple of changes I want to see incorporated into some boost libraries. In this particular instance the modules are mpl and tools. <snip> I'm sort of uncomfortable with deleting the "official" version - but it seems the right think to do.
I would appreciate any observations/advice from some more experienced boosters.
You can create a fork and use it as additional remote. Locally you can store a mix of branches reflecting remote branches from the original repo and your fork. The procedure is described here: https://github.com/boostorg/geometry/wiki/Contribution-Tutorial Regards, Adam
very nice. See if you can get this integrated into the Boost https://svn.boost.org/trac/boost/wiki/ModularBoost Robert Ramey -- View this message in context: http://boost.2283326.n4.nabble.com/git-workflow-questions-for-boost-tp466443... Sent from the Boost - Dev mailing list archive at Nabble.com.
On 06/25/2014 09:18 AM, Robert Ramey wrote:
But I have a couple of questions about this.
I currently have modular boost installed on my machine. It seems that I want to:
delete the module in question. clone to the same spot I just deleted. do everything above. delete the module again. clone from the original? update super project? rerun b2 headers? what? - I'm sort of at a loss here.
I'm sort of uncomfortable with deleting the "official" version - but it seems the right think to do.
If I understand your workflow correctly, I believe what you want to do is: * Checkout develop on module <- important as by default you are on detached head * Make your changes / commits * Fork on github if you have not already * Add a new remote to the module in question (Using another name (your username?) instead of origin) https://help.github.com/articles/adding-a-remote * git push new_remote develop * Submit pull request After the pull request is accepted you may do the following if you want: * Pull / fetch / reset back to origin develop once pull request accepted (pulling the boost super project may also work) * Optionally delete your repo/remote (I personally leave them in case I will submit a new request again) I am mostly listing this from memory, so take a grain of salt. - Thomas
participants (3)
-
Adam Wulkiewicz
-
Robert Ramey
-
Thomas Suckow