Microsoft KB Archive/130881

{| = How to Update a Project Using Delta as Bugs Are Resolved =
 * width="100%"|

ID: Q130881

The information in this article applies to:


 * Microsoft Delta for Windows, version 1.0

SUMMARY
As a release version nears completion, new development may have already begun on the next release. This presents a problem in versioning. How is the source code for the next release updated when the previous release is completed? This article helps answer that question.

MORE INFORMATION
Here is a procedure that may be helpful. It requires two projects to be set up with Microsoft Delta. One project (mainprj) contains the main development. The second, spin-off project (release) is the project that completes a release. The completed code is then used to update the new version if necessary.

The Merge Process
1. Check out the source code from "mainprj" that was used to create

"release" by checking out the previous version of the source code. A  Delta release should be used to simplify the process. 2. Copy the completed "release" code over "main." 3. Test the source code.

4. Check in the source code. The completed source code is now merged

with the current source code of "mainprj." 5. Resolve any merge conflicts if necessary. The merge combines the changed files of "release" and the current source code in "mainprj."

Step-by-Step Example
1. Mainprj nears a released version.

2. At some point, Mainprj code is made into a separate project called

Release. 3. Mainprj's focus is now on the next release. 4. The Release project is completed.

5. If necessary, the completed code from the Release project is now merged

with the code in the Mainprj project. Additional reference words: 1.00 KBCategory: kbusage KBSubcategory: Delta
 * }