You'll want to fork edge and integrate your work there (makes it easier for me to merge stuff into edge). You can easily commit code in a submodule. First, fork my edge branch; then add your fork as a submodule (git submodule add [email protected]:/username/community_engine.git vendor/plugins/community_engine). Then you can work in your community_engine fork and commit your changes to your github repo.
If you've already got CE installed as a submodule pointing to my fork, you can still create your own fork and add it as a remote, and then push your work there. Thanks, Bruno On Thu, Nov 12, 2009 at 10:42 AM, mike muldoon <[email protected]>wrote: > True dat, and I knowingly made changes I need to deal with now. Github > made it easy to find my changes, and I now have some code I'd like to > (write tests for!) and submit to CE for inclusion. Since I installed > CE as a submodule, my code clearly isn't a branch I can commit to. > > Should I fork from master or edge to commit such work? > > On Thu, Nov 12, 2009 at 7:59 AM, Bruno Bornsztein > <[email protected]> wrote: > > Note: best practice is not not have local modifications to the > > community_engine directory. The whole point of making it a plugin and > using > > Desert is to allow/encourage you to make your customizations in your app, > > not directly to the CE codebase. > > Also, make sure you > > read > http://github.com/bborn/communityengine/blob/master/UPGRADING.markdown > > when performing your upgrade. > > Good luck, > > Bruno > > > > On Thu, Nov 12, 2009 at 9:57 AM, mike muldoon <[email protected]> > > wrote: > >> > >> That's the droid I'm looking for. 'git submodule diff' sure would be > nice, > >> tho! > >> > >> thx for the clue! > >> > >> On Thu, Nov 12, 2009 at 1:30 AM, Jim Ruther Nill <[email protected]> > wrote: > >> > "git submodule update" would update the CE code but all your CE > >> > modifications (in the plugins directory) will be silently overwritten. > >> > > >> > On Thu, Nov 12, 2009 at 3:32 PM, Mike Muldoon <[email protected] > > > >> > wrote: > >> >> > >> >> Yes, it is installed as a git submodule. > >> >> Fyi, 'git fetch' has no effect, and 'git branch -a' only shows master > >> >> and > >> >> origin/master. (working from memory here, please bear w me) > >> >> Is there some type of 'git submodule ...' command to manage this > >> >> process? > >> >> > >> >> On Nov 11, 2009, at 9:05 PM, Jim Ruther Nill <[email protected]> > wrote: > >> >> > >> >> 'script/generate plugin_migration' just creates a migration in your > >> >> app > >> >> to include the migrations in CE. > >> >> > >> >> have you installed CE as a git submodule? > >> >> > >> >> On Thu, Nov 12, 2009 at 9:48 AM, mike muldoon < > [email protected]> > >> >> wrote: > >> >>> > >> >>> Hello all, > >> >>> > >> >>> I'm running the master branch v1.0.2, and want to upgrade to v1.0.3 > >> >>> > >> >>> I thought running 'script/generate plugin_migration' from my > >> >>> application root would pick up the new version, but it does not:: > >> >>> > >> >>> muld...@fedora$ script/generate plugin_migration > >> >>> All plugins are migrated to their latest versions > >> >>> > >> >>> > >> >>> Is v1.0.3 actually edge? > >> >>> > >> >>> Is 'script/generate plugin_migration' not the correct way to > upgrade? > >> >>> > >> >>> tx! > >> >>> Mike > >> >>> > >> >>> -- > >> >>> > >> >>> You received this message because you are subscribed to the Google > >> >>> Groups > >> >>> "CommunityEngine" group. > >> >>> To post to this group, send email to > [email protected]. > >> >>> For more options, visit this group at > >> >>> http://groups.google.com/group/communityengine?hl=. > >> >>> > >> >>> > >> >> > >> >> > >> >> > >> >> -- > >> >> "We do not believe in ourselves until someone reveals that deep > inside > >> >> us > >> >> is valuable, worth listening to, worthy of our trust, sacred to our > >> >> touch." > >> >> - E. E. Cummings > >> >> > >> >> -- > >> >> > >> >> You received this message because you are subscribed to the Google > >> >> Groups > >> >> "CommunityEngine" group. > >> >> To post to this group, send email to > [email protected]. > >> >> For more options, visit this group at > >> >> http://groups.google.com/group/communityengine?hl=. > >> >> > >> >> -- > >> >> > >> >> You received this message because you are subscribed to the Google > >> >> Groups > >> >> "CommunityEngine" group. > >> >> To post to this group, send email to > [email protected]. > >> >> For more options, visit this group at > >> >> http://groups.google.com/group/communityengine?hl=. > >> > > >> > > >> > > >> > -- > >> > "We do not believe in ourselves until someone reveals that deep inside > >> > us is > >> > valuable, worth listening to, worthy of our trust, sacred to our > touch." > >> > - > >> > E. E. Cummings > >> > > >> > -- > >> > > >> > You received this message because you are subscribed to the Google > >> > Groups > >> > "CommunityEngine" group. > >> > To post to this group, send email to [email protected] > . > >> > For more options, visit this group at > >> > http://groups.google.com/group/communityengine?hl=. > >> > > >> > >> -- > >> > >> You received this message because you are subscribed to the Google > Groups > >> "CommunityEngine" group. > >> To post to this group, send email to [email protected]. > >> For more options, visit this group at > >> http://groups.google.com/group/communityengine?hl=. > >> > >> > > > > -- > > > > You received this message because you are subscribed to the Google Groups > > "CommunityEngine" group. > > To post to this group, send email to [email protected]. > > For more options, visit this group at > > http://groups.google.com/group/communityengine?hl=. > > > > -- > > You received this message because you are subscribed to the Google Groups > "CommunityEngine" group. > To post to this group, send email to [email protected]. > For more options, visit this group at > http://groups.google.com/group/communityengine?hl=. > > > -- You received this message because you are subscribed to the Google Groups "CommunityEngine" group. To post to this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/communityengine?hl=.
