We launched new forums in March 2019—join us there. In a hurry for help with your website? Get Help Now!
    • 34162
    • 1 Posts
    Is the main trunk in SVN for the current development version of MODx?

    Are the branches for whatever other dev is doing?

    In the case of xwisdom will have his "Green" stuff and in the case of OpenGeek will have his "database abs" stuff.

    Is that a correct assumption?

    PS: What is the different between "tatoo" and "tatoo-assets"?

    Thanks
      • 25663 MODX Staff
      • 12,272 Posts
      Each devs branch is for their internal expiriments. The main trunk is the current dev branch. We do an svn copy of the repository from a known rev for releases.
        Ryan Thrash, MODX Co-Founder
        Follow me on Twitter at @rthrash or catch my occasional unofficial thoughts at thrash.me
        • 34162
        • 1 Posts
        If I want to try out some breeding edge stuff from xWisdom or OpenGeek can I download from their branch to try thing out?

        I am not too clear on the different between "tatoo" and "tatoo-assets" in SVN?

        I know "tatoo" is the main branch that is use to release new version of MODx but what "tatoo-assets" is for?

        Thanks
          • 22303 MODX Staff
          • 10,725 Posts
          Quote from: chanh at Feb 14, 2006, 12:19 PM

          If I want to try out some breeding edge stuff from xWisdom or OpenGeek can I download from their branch to try thing out?
          I am not too clear on the different between "tatoo" and "tatoo-assets" in SVN?
          I know "tatoo" is the main branch that is use to release new version of MODx but what "tatoo-assets" is for?
          I am keeping Tattoo in SVN in my branch (not sure about Raymond’s Blue*/Green* stuff; you are welcome to check out my branch; however, it will probably be another week or two before it’s usable since the only current input method for Resources and Elements is directly into the DB (no manager or installer yet), and since the DB structures are a little more complex, that becomes quite a task. Ryan and I are working on some initial manager pages now, at least for entering and editing Resources and Elements so you can more easily work with the new code. However, feel free to check out the source, and see what’s going on, discuss, challenge ideas, etc.

          tattoo-assets contains some code that would not be directly included in product (i.e. bootstrap installation server, etc.). Not much there yet...

          For an example usage fow, typically, you do your development in a branch and then merge it into the tattoo trunk when done with development so you can do integration testing with the current trunk. Then you commit to the trunk, once you are sure everything is merged and tested in the latest trunk.
            • 34162
            • 1 Posts
            Jason,

            Thanks for the explanation!

            That helps me to understand how SVN is organized and it is very good way to keep the trunk nice and clean.