December 2006 Volume 10, Number 4

The RSE Extensions Compare/Merge

By Joe Baumgarten, Sales Engineer

In our last issue of The Landing Zone, we announced our RSE Extensions for WDSC, a robust plug-in set that includes the Eclipse-based source compare and merge utility. In this issue, we’ve talked a lot about using TurnOver’s Synchronizer utility to manage a specific situation: merging a vendor’s new software release with both the last release and your local modifications.

Now it’s time to show you how you can use this powerful tool in your daily iSeries programming world, in situations that don’t call for the Synchronizer framework. (These instructions assume that you went right out to the Web and downloaded the RSE Extensions plug-ins for WDSC as soon as you read the last issue’s article.)

Suppose, for example, that both Ray and Joe have checked out APCLP001 from JBPRODLIB at the same time. Ray has promoted his changes into JBQALIB, and now Joe wants to push his changes to QA as well. Obviously, he’ll need to merge his changes with Ray’s.

In WDSC’s Remote Systems Explorer, Joe would locate his development source member, right click, and choose first RSE Extensions, then Merge, as shown below.

Figure 1: Running the RSE Extensions Merge

Joe would specify Ray’s changes in QA as the “maintenance” version, and the original code in production from which they both started as the “root” version.

Figure 2: The RSE Extensions Merge Source Members prompt

And when he clicks OK, he would see this:

Figure 3: The Merge Editor

Once Joe pulls Ray’s change block from the right over to the left, he’s good to go! To download or to read more about SoftLanding’s RSE Extensions plug-ins for WDSC, visit our download site.

Back to Table of Contents

WHAT'S NEW