On Wed, 2011-01-19 at 11:28 +0530, Shakthi Kannan wrote: > --- On Wed, Jan 19, 2011 at 11:07 AM, Kenneth Gonsalves > <[email protected]> wrote: > | that is obvious - how to keep the branches in sync with trunk and at > the > | same time retain the special features of the branch? > \-- > > Ideally, if each feature is modular/a separate plugin, you will have a > separate branch for each feature. For your customization/release, you > will merge the necessary feature branches to the release branch.
looks a bit to high funda for me ;-) My need is much simpler. I wrote an application for running golf tournaments and put it up on a server on the web. Two clubs are using it. So the main app had things like 'manage ooty handicaps' and 'manage coimbatore handicaps' on the menu to make things simpler. Unfortunately most golf courses are far outside the city and connectivity is bad. So now I have three branches - the main repo, one repo in Ooty customised for Ooty and another in Coimbatore customised for Coimbatore. If I pull from the main repo, the customisation gets zapped. However transplant permits me to pull only a particular changeset - this is perfect for my needs. I can cherry pick what I want to pull. The only thing is that I need to be more disciplined in committing - just one change per changeset. -- regards KG http://lawgon.livejournal.com Coimbatore LUG rox http://ilugcbe.techstud.org/ _______________________________________________ ILUGC Mailing List: http://www.ae.iitm.ac.in/mailman/listinfo/ilugc
