Yeah - I agree with most of your points. The current situation of Jaggery is that when somebody wants to release their product, they get a release of jaggery done. Let's say jaggery 0.9.0.ALPHA4.wso2v2. Now a branch is created and called 0.9.0.ALPHA4.wso2v2.
If a person has a bug in 0.9.0.ALPHA4.wso2v2 he will fix it in that branch (IMO is incorrect). Then they use that branch as a dependency. I propose to use a tag as opposed to a branch (0.9.0.ALPHA4.wso2v2). This tag will be checked out and the patch will be done and sent to the develop branch. We make a new release tag out of that version (which is a patch version) - which can be 0.9.0.ALPHA4.wso2v3. But as opposed to branch -it's a tag. Cheers~ On Thu, Apr 3, 2014 at 10:17 AM, Rushmin Fernando <[email protected]> wrote: > The notion of tags are there in almost the all version control systems, > though the how they store tags is different. > > It's true that Git has some addition features to work with tags. > > But the concept of a tag is to point to a snapshot of the code base which > does not change. > > In Git when we checkout a tag it causes a detached head. You can checkout > a tag and build the code, but it is discouraged to commit to a tag since it > abusing the purpose. > > (But you can create a branch from a tag and use it as the bug fix branch) > > Thank you > > > On Thu, Apr 3, 2014 at 1:01 AM, Chan <[email protected]> wrote: > >> We do indeed support older releases. Git provides a cool feature for this >> called tagging. We tag the master branch when ever we make a release. If we >> want to obtain the codebase of 1.0.0 - we just checkout the tag. >> >> Cheers~ >> >> >> On Wed, Apr 2, 2014 at 11:51 AM, Rushmin Fernando <[email protected]>wrote: >> >>> Just thinking aloud since im interested in release management stuff ... >>> >>> AFAIK release branches are maintained even after the release to make >>> sure a bug fix for a specific release can be done without worrying about >>> further releases done (may be practically half baked code as well) in >>> develop branch / master. >>> >>> But this is subjected to the release pattern of the product. If we don't >>> support older releases then we might not need release branches after the >>> release since the latest release is reflected in master branch. >>> >>> ( But technically in Git we can create a branch from a commit. So >>> deleting feature branches might not be a big deal since we can create a >>> branch from a tag when a bug fix for a release is needed ) >>> >>> >>> On Wed, Apr 2, 2014 at 11:08 AM, Chan <[email protected]> wrote: >>> >>>> Hi Rushmin, >>>> There will be 2 permanent branches >>>> >>>> - master >>>> - develop >>>> >>>> When we work on a feature - we create a branch called >>>> feature/feature-name on local repo. If there are collaborators we push them >>>> to remote repo. Afterwards when the feature is complete - we merge it to >>>> the develop branch. >>>> If we have a release in 2 weeks - we create a release branch (named >>>> release/release-name) from the develop branch and work it. This will mostly >>>> be stabilization work. What ever features that are completed during this >>>> time will not be available to the release since they are not stable. When >>>> we release - we merge the release branch to master and develop branch. We >>>> tag the master branch with release name. >>>> >>>> Cheers~ >>>> >>>> (My previous email fired off with Command +Enter. Apologies to that) >>>> >>>> >>>> On Wed, Apr 2, 2014 at 11:05 AM, Chan <[email protected]> wrote: >>>> >>>>> There will be 2 permanent branches >>>>> >>>>> - master >>>>> - develop >>>>> >>>>> >>>>> >>>>> On Tue, Apr 1, 2014 at 9:30 PM, Rushmin Fernando <[email protected]>wrote: >>>>> >>>>>> Hi Chan, >>>>>> >>>>>> Do you mean that there are obsolete release branches which should be >>>>>> deleted, after tagging the tips of them ? >>>>>> >>>>>> Thanks >>>>>> /rushmin >>>>>> >>>>>> >>>>>> On Tue, Apr 1, 2014 at 7:45 PM, Chan <[email protected]> wrote: >>>>>> >>>>>>> Hi folks, >>>>>>> I believe we can improve the git workflow of the jaggery project[1]. >>>>>>> Currently we have many release branches (IMO bad decision since these >>>>>>> branches will evolve separately). They need to ideally be tags. We have >>>>>>> been discussing about Git Flow (check Git flow model @architecture) - >>>>>>> and I >>>>>>> think we can sort out most of these troubles with git flow. WDYT? >>>>>>> >>>>>>> [1] - https://github.com/wso2/jaggery/branches >>>>>>> Cheers~ >>>>>>> >>>>>>> -- >>>>>>> Chan (Dulitha Wijewantha) >>>>>>> Software Engineer - Mobile Development >>>>>>> WSO2Mobile >>>>>>> Lean.Enterprise.Mobileware >>>>>>> * ~Email [email protected] <[email protected]>* >>>>>>> * ~Mobile +94712112165 <%2B94712112165>* >>>>>>> * ~Website dulitha.me <http://dulitha.me>* >>>>>>> * ~Twitter @dulitharw <https://twitter.com/dulitharw>* >>>>>>> *~SO @chan <http://stackoverflow.com/users/813471/chan>* >>>>>>> >>>>>>> _______________________________________________ >>>>>>> Dev mailing list >>>>>>> [email protected] >>>>>>> http://wso2.org/cgi-bin/mailman/listinfo/dev >>>>>>> >>>>>>> >>>>>> >>>>>> >>>>>> -- >>>>>> *Rushmin Fernando* >>>>>> *Technical Lead* >>>>>> >>>>>> WSO2 Inc. <http://wso2.com/> - Lean . Enterprise . Middleware >>>>>> >>>>>> email : [email protected] >>>>>> mobile : +94772310855 >>>>>> >>>>>> >>>>>> >>>>> >>>>> >>>>> -- >>>>> Chan (Dulitha Wijewantha) >>>>> Software Engineer - Mobile Development >>>>> WSO2Mobile >>>>> Lean.Enterprise.Mobileware >>>>> * ~Email [email protected] <[email protected]>* >>>>> * ~Mobile +94712112165 <%2B94712112165>* >>>>> * ~Website dulitha.me <http://dulitha.me>* >>>>> * ~Twitter @dulitharw <https://twitter.com/dulitharw>* >>>>> *~SO @chan <http://stackoverflow.com/users/813471/chan>* >>>>> >>>> >>>> >>>> >>>> -- >>>> Chan (Dulitha Wijewantha) >>>> Software Engineer - Mobile Development >>>> WSO2Mobile >>>> Lean.Enterprise.Mobileware >>>> * ~Email [email protected] <[email protected]>* >>>> * ~Mobile +94712112165 <%2B94712112165>* >>>> * ~Website dulitha.me <http://dulitha.me>* >>>> * ~Twitter @dulitharw <https://twitter.com/dulitharw>* >>>> *~SO @chan <http://stackoverflow.com/users/813471/chan>* >>>> >>> >>> >>> >>> -- >>> *Rushmin Fernando* >>> *Technical Lead* >>> >>> WSO2 Inc. <http://wso2.com/> - Lean . Enterprise . Middleware >>> >>> email : [email protected] >>> mobile : +94772310855 >>> >>> >>> >> >> >> -- >> Chan (Dulitha Wijewantha) >> Software Engineer - Mobile Development >> WSO2Mobile >> Lean.Enterprise.Mobileware >> * ~Email [email protected] <[email protected]>* >> * ~Mobile +94712112165 <%2B94712112165>* >> * ~Website dulitha.me <http://dulitha.me>* >> * ~Twitter @dulitharw <https://twitter.com/dulitharw>* >> *~SO @chan <http://stackoverflow.com/users/813471/chan>* >> > > > > -- > *Rushmin Fernando* > *Technical Lead* > > WSO2 Inc. <http://wso2.com/> - Lean . Enterprise . Middleware > > email : [email protected] > mobile : +94772310855 > > > -- Chan (Dulitha Wijewantha) Software Engineer - Mobile Development WSO2Mobile Lean.Enterprise.Mobileware * ~Email [email protected] <[email protected]>* * ~Mobile +94712112165* * ~Website dulitha.me <http://dulitha.me>* * ~Twitter @dulitharw <https://twitter.com/dulitharw>* *~SO @chan <http://stackoverflow.com/users/813471/chan>*
_______________________________________________ Dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/dev
