I am thinking to switch to VWD 2005 from vs2003. The reason for this is this.

My client posts a new requirement R1.

This requires me do changes C1 and C2 on file F1. I will do this and upload to test server.

Then Client posts a new requirement R2.

This requires me to do change C3 on the same file F1. I will do this and upload to test server.

Client tests and then asks me to go live with requirement R2 alone. Then I have to undo changes C1 and C2 on file F1.

On a later date, he may ask to go live with requirement R1. At that time I have to do changes C1 and C2 again on file F1.

This is one of the "programming hazard" I am undergoing each day. In most of the cases, there will be multiple such files and / or database changes.

My question is: is there a smart way to overcome this situation (not having to do same change two times) in VWD 2005 ?

Sourcesafe can give me a a copy of the file before R1 and before R2. But, it cannot automatically create a copy by discarding changes made in R1 alone. May I know whether such a facility is available in VWD 2005 ?

It should apply the changes between R1 and R2 to the file F1. It should also store changes C1 and C2 so that on a later date, I will have to apply them also.

I am looking for a more general solution rather than commenting some lines or so. Changes C1 and C2 can be quite complex and hence I cannot simply comment out some lines (and later uncomment).

I don't think there are any tools that can do this.

What you're asking for is quite a complex merge feature. Tools like Visual Source Safe (and the much better alternative Sourcegear's Vault) can indeed do roll backs, to allow you to go back a version. Theoretically, you could do a rollback, and then merge the rolled back version with a working version to add the R2 features into the R1 roll back.

However, on what ground should the tool decide what goes where. Is something you removed in R2 part of the new R2 feature, or should it be considered a roll back part from R1? You tell me... (or in fact, tell the tool).

So, bottom line: I don't think any tool can do that.

That said, VWD doesn't come with additional tools. It ships with a slightly new version of Visual Source Safe. The Team System editions come with a new source control system with a lot of new features including Work Item Tracking and shelving. Maybe it also has advanced merging support, but I doubt it will do what you're asking... I am not 100%, but you may also need the server part of Team System which is quite expensive.

Imar
---------------------------------------
Imar Spaanjaars
Everyone is unique, except for me.

Dear Imar,

Many thanks for the reply.

I agree that my requirement is too complex.

Generally, in my case, the changes will be independent. (If they are not independent, we will say that it is not possible and we should go live with C1 before going live with C2). Since, there is only one dll, we cannot do unrelated changes independently. This is causing the problem.

Anyway, since there are no solutions in VWD 2005, I will explore possibilities of achieving this through some object oriented techniques like method overloading or so. I will post the results as a seperate topic in relevant category.