Hi All, I need help in merging my code changes into the production dir. we have an production dir & every time we get an new request we copy the prodution version into our new working dir,and make code changes to various programs.Now i have to merge my code changes from my working dir to the production dir. can anybody tell some easiest way to do it. waiting for your reply.

Consider using a revision control system such as RCS or cvs. Manual copies do not allow for branches and verstion control.

HI, Thanx for that, but presently we are using SCCS for version control. Sometimes it happens that many people have to work on the same file,and merge the changes in the same file before checking in the file in source control. Presently we are doing it manually(merging all the programmers changes in one file). Then we are checking in the file.

You are saying then your work flow allows a second person to copy, not check out a reserved file and modify it before the first one has checked in the changes. Are you using branches as described in the SUN documentation at http://docs.sun.com/app/docs/doc/802-5880/6i9k05di1?a=view or are you completely bypassing the best practice work flow? You should still consider migrating from SCCS to any of the much more modern, capable version control systems such as cvs, which explicitly has support for merging branches. From the O'Reilly book on SCCS If someone else already had locked the revision you requested, you would not be able to lock it yourself. You could still obtain the revision for reading only, however, even if it were locked, because SCCS assumes that you won't modify the file when you get it for reading only. So for example, if you asked to modify the latest revision of s.xform.c but someone else was already changing it, you would see a message like this one: $ get -e s.xform.c1.1 ERROR [s.xform.c]: being edited: `1.1 1.2 cullen 95/05/08 13:08:49' (ge17) http://www.oreilly.com/catalog/rcs/index.html

HI, Yes we are bypassing the best practice work flow. we copy the files,without checking it out, amd make our changes. At the time when it has to go to production we have to merge all the programmers changes in one file.This file is then moved to the production. so,how can we overcome the manual work of merging. waiting for your response.

Because you choose to bypass the version control method you have in place, you are left with a manual merge operation involving diff and the manual application of changes. Your life would be much easier if you used a more current version control system that supports branches and allow the software to work as it should.

HI, Can you please let me know, what other alternative Source control can be used for this. I have heard about CVS,can you please put some more light on this. With Regards, Pradeep