Old ASP Files Do Not Merge

[JDIMS]

System Configuration: Vault 3.1.8, Visual Studio 2003 (VB.NET), Windows Server 2003 (servers and workstations)

Bottom line: ASP (old) files in a mixed asp.net + old asp application are not merging.

Background:
Our original application was in ASP, but was largely moved over to ASP.NET. Soon we will have all files in .NET (currently about 90%) but some have lagged, thanks in part to the classic "someone left with the documentation in his head". We now have 2 remote developers over a secure WAN (govt) link, and vault has solved our (VSS) bandwidth problems. Several nagging problems have come up with Vault that we never had with VSS. This is one.

The requirement
We want to not only use Vault as a check-in & check-out but to track releases so that, if necessary we can roll back changes after publishing. Several times our users got the new changes asked for, as described and then realized the business rules needed some re-thinking (i.e., more complexity to handle the real world, often workflow issues) and wanted a new feature un-done while they figured out what they really need. So, we are trying to have several branches, reflecting development, in-test / staging, and production - and possibly the "on-hold" items.

When we merge changes on major builds / deliveries, and try to merge (e.g. completed development files into the test configuration) the ASPX and .VB files make it but ASP files are not merged. It will be several major block-change deliveries before we can also include/migrate all the old ASP files to .net, and sometimes we need to make a one or two line change to the asp file (usually to sync with database changes) than to hold up the whole delivery

We target 2 new asp.net features for every asp to asp.net conversion - and this ratio works for us in terms of resources - personnel, testing & final deployment schedule (it also isn't likely to change as the customer has a say in the tradeoffs between new requirements and the benefits of a clean configuration. All production deployments / publishes include .NET changes, 75% with a "dump the asp page and replace it with asp.net" and a good number - but well under 50% - include one or more old asp file changes (asp stays, but changes). When the ASP file fails to be merged, we know it (changes are often a new stored procedure parameter). The "build" seems to succeed, given that asp doesn't affect the asp.net DLL build, but the final application fails to work properly when put on line.

What needs to be done to get the asp files to work properly, including merge? This is one of 4 show-stopper problems that are serious enough to drop Vault - something management is seriously considering.

[Beth]

Could you double check that .aspx is still listed as a mergeable file type in your admin tool? If that is listed there, then would you be willing to send me your Vault Server Log and maybe I can help you through the other issues you are having as well.