Arc Forumnew | comments | leaders | submitlogin
1 point by shader 4604 days ago | link | parent

How do you organize your hacks in git? I'm working on several libraries, and I'm running into the issue that I want them in separate version control so that I can push them to github separately, if need be, and not pollute Anarki until I'm finished. At the same time, I need them in the arc lib directory for using. How did you solve this one? Just keep them in separate folders near your arc installation and do (load "../blah/lib.arc")?

1 point by CatDancer 4604 days ago | link

One approach is to create a clean patch that doesn't have any of your private development history in it. See Linus Torvalds comments:

So if you want your library foo.arc to land in Anarki in the lib directory, create a patch to Anarki that adds foo.arc to the lib directory in a single commit.

One way to do this is to have one branch that tracks Anarki, and then a separate branch for your own development. You can merge new Anarki commits into your private development branch, but avoid ever merging from your development branch back into your Anarki tracking branch directly. Then in your private development branch you can have a messy development history (create foo, change bar, change foo, do something else, then change foo again), but only have add clean commits to your Anarki tracking branch that you push to Anarki ("create foo" or "update foo").