Project Management / Multiple Versions

Question

I am looking here for some tips and advice on how to manage multiple versions of a project.

I currently have a version for developing an application that includes some improvements and new features. Meanwhile, I have to make some decision mistakes. It is easy to fix errors in files that were not affected by new features, but as soon as I touch a page that has a new feature. I need to comment a few lines of code each time. I feel that this is not the best way to play. There should be a method sufficient to solve this problem.

On the other hand, the problem is deployment. Very often, I have to wait a few weeks before uploading new functionality to a website. Meanwhile, I sometimes forget every file that has been modified (or commented out for errors), and it can create errors. I heard about capistrano for rubies, can this help me? I am mainly a PHP / asp.net developer.

Answer 1

You are experiencing the classic case of " incompatible development":
you cannot simultaneously fix the error and develop one file at the same time.

This is a classic branching case that allows a single file:

• , ( )
• bugfix
• .

VCS ( ), , , 2 ( 1.0 'DEV'), "" .
, WinMerge,

VCS , - ( ).
, , , capistrano.

Answer 2

"" , .

, "1.0" . "1.1", 1.0. 1.1, 1.0 ( 1.1 ). (, 1.0 1.1).

subversion.

http://svnbook.red-bean.com/en/1.1/ch04.html

, .

Answer 3

- .

Answer 4

- . , perforce, svn .. , , Perforce. . , . . perforce, , .