Very good point Fred. Thank you all for all your comments. I really appreciate it.
On Apr 10, 2:25 pm, Frederick Cheung <frederick.che...@gmail.com> wrote: > On Apr 10, 2:58 pm, pepe <p...@betterrpg.com> wrote: > > > Thanks guys. > > > Based on what I've read so far about VCSs and especially about git I > > know that I can 'fork'/'clone' the repository but I still didn't get > > the answer (or I am too thick to get it) that I am looking for. > > > Fred, I thought branches are just used for development that later on > > have to be merged to the master/trunk. If that is the case a branch > > would not be a 'version'/'fork' from the main vanilla version because > > in the end it would end up merging. I might have misunderstood what > > you were saying? > > How you use branches is up to you - nothing is going to get merged > unless you ask it to. Using shortlived branches for the purpose of > developing a particular feature is a common strategy but that's just a > particular way of working - branches can be long lived too. (Eg the > rails git repository has a 2.3.stable branch, 2.2.stable branch, and > at some point will have a 3.0 stable branch. Work usually happens on > master with specific changes being backported when necessary). > > Fred > > > > > I also understand that any change to the code would have to be > > determined to be a 'vanilla' feature or a specific one to the > > client(s) using a particular version of the application. > > > What I need is to know if it is possible to 'push' out mods from the > > vanilla version to the other ones and which VCS would allow that. I am > > very new to this so I might not understand *how to* do it yet but I > > need sort of a yes/no answer to at least know if that is possible, and > > optionally if it can be more or less automated. Once I have that > > answer it would just be a matter of getting deep into learning the > > tool. > > > Thanks so much guys. > > > Pepe > > > On Apr 10, 9:12 am, Michael Pavling <pavl...@gmail.com> wrote: > > > > On 10 April 2010 03:25, pepe <p...@betterrpg.com> wrote: > > > > > Also take into consideration that we have never used a version control > > > > system so my questions might just be due to lack of knowledge and/or > > > > understanding as of how to use the VCS. > > > > Well, distributed version control is going to be your friend here, but > > > you are going from a standing start to pretty much the most > > > complicated use of it. > > > > Personally, I'm a Mercurial fan, but Git is very similar. Either way, > > > both tools allow developers to maintain their own clones of a central > > > repository, and to make as many commits as they like to give them a > > > safety net as they work. At whatever interval (normally for me, it's > > > when a "feature" is working and passing tests) their local changes are > > > pushed up to the repository (and merged if necessary, but if they've > > > been doing lots of little commits, the merge is often done for you). > > > > At that point, cloning out features to the other branches would need > > > to be done (probably by a dedicated person who knows the individual > > > systems well). "propagate those changes selectively" is almost > > > certainly going to mean a large level of manual intervention, but > > > again, this is much easier to decipher with the incremental commits > > > that become the signature of DVCS. > > > > Check outwww.hginit.comforavery good "getting started" guide for > > > Mercurial. > > > I use a "Turnkey Linux" server for my Mercurial machine, but you can > > > install it on anything and configure yourself. The benefit of the > > > Turnkey machine is that you get up and running in about 15mins, and > > > can play with a few different systems for > > > comparison.http://www.turnkeylinux.org/revision-control -- You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group. To post to this group, send email to rubyonrails-t...@googlegroups.com. To unsubscribe from this group, send email to rubyonrails-talk+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/rubyonrails-talk?hl=en.
