Perform an Incremental Migration

NOTE: This step assumes that you have performed changes to the Visual Basic 6.0 code that you want to include in the migrated code.

Generate the New Green Code

  • 1. Check out the green code

    Checkout GreenCode

  • 2. Open the Visual Basic Upgrade Companion and migrate the new VB6 Code. In our example the code is in C:\MergeExample\Sample1\VB6

  • 3. Copy the new contents of the Upgraded folder and overwrite the contents in the GreenCode folder (in this case, copy contents from C:\MergeExample\Sample1\VB6_UpgradedCode\Upgraded to C:\MergeExample\Sample1\GreenCode).

  • 4. Check in the new Green Code with changes

    3

    Check in greencode chenges

  • 5. Add a descriptive comment when checking in the code, with at least the following information:

    • Green Code version
    • VB6 Source Code version
    • VBUC version 3.0

Merge the Newest Changes

After migrating the modified VB6 source code and checking-in it in the Source Control, it is now necessary to merge the changes between the new GreenCode and our MigratedCode.

  • 1. Right click on the GreenCode folder and select Merge. In the Source Control Merge Wizard dialog box, make sure “Selected ChangeSets&rlquo; is selected and that the Target Branch is the MigratedCode. Click Next

    Source Control Merge Wizard

  • 2. Select the Changesets that you will apply. The comments provide a guide to identify which changesets you need. Click Next.

    Changesets to apply

  • 3. Click Finish to perform the Merge

    Finish to perform the Merge

  • 4. During the merge, conflict might arise. The Resolve Conflicts dialog will appear. Click the Resolve... button to review the different options for solving merge conflicts.

    Resolve Conflicts

    TIP: Typically you will just keep changes in target branch because you have already worked on those files. Especially for resource files, project files, bitmaps, etc., you will leave the file in the target branch.

  • 5. The Source Control Explorer will show the modified files once all conflicts are resolved

    Source Control Explorer shows the modified files

  • 6. Right click on the MigratedCode folder and select Check In Pending Changes...

    MigatedCode: Check in pending changes

  • 7. Type an appropriate comment indicating which versions where merged and press Check In

    Type an appropriate comment

With this process, the current Migrated Code branch will have the changes performed in the Visual Basic 6.0 application, and will keep all the manual changes already performed to the migrated code as part of the migration project.

See Also:

Skip Navigation Links.