We don't have release versions in the traditional sense (v1.0, etc.). Insoshi is still in what you could consider "continuous development."
Our typical development cycle is [development] -> edge -> master Features, fixes and other updates are developed on local branches which are then merged onto edge. After some period of public testing (usually on our demo site), it's then merged onto master (which is what dogfood runs on). The tags are really just markers we place for reference: last original layout, rails 2.0 version, etc. If you are starting off development on a project based off Insoshi, you probably do want to start based on the master branch. You can choose to merge just official master branch updates. That way you have a bit more stability from the code. For contributions, we prefer that they're based off edge since they'll get merged into that before going to the official master branch. It can be a hard balance to chose either the stability of your own site (meaning less merges with official updates) and being able to easily contribute the code back to Insoshi. [The same is true for any development effort.] However, depending on what the contributed updates are and what updates are already on edge, it actually may be an easy (or not too difficult) merge even if the contributions were based off an older version of master branch. You can always test this by testing the merge to edge on a throwaway branch. And don't forget that "git cherry-pick" can allow to just grab the updates associated with a particular commit (as opposed to that commit and everything before it). Long On Tue, Nov 11, 2008 at 2:19 PM, vanweerd <[EMAIL PROTECTED]> wrote: > > Hi All, > > I'm trying to understand the deployment model for using Insoshi. > > I see "Rails21" for a tag, but I don't see any means to identify a > release point for deployment. I assume Rails21 is the start point of > Rails21 compliance, but that is only for reference and that I want to > work of the master, which is really the ongoing stable release branch. > > I would guess that work would be done of edge or master depending on > your goals (pure development or adding features for a live site). i.e. > I can assume more stability on master. For a site, I could see > branching master, developing on that, keeping edge current with the > main insoshi repository, and merging from my master branch to my > tracking edge branch, and then pushing to my fork and issuing a pull > request. Though I suppose this could get awkard over time if I stay on > an older branch of the master branch on the main repository. > > I hope this is making sense. I am building a live site, and want to > develop against stable branches, yet still be in a good position to > submit code back. > > Does the above make sense? > > Also, will Insoshi being changing it's release process once it's > further developed? > > Thanks, > Nick > > > -- Long Nguyen [EMAIL PROTECTED] --~--~---------~--~----~------------~-------~--~----~ Insoshi developer site: http://dogfood.insoshi.com/ Insoshi documentation: http://docs.insoshi.com/ You received this message because you are subscribed to the Google Groups "Insoshi" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/insoshi?hl=en -~----------~----~----~----~------~----~------~--~---
