Compare and merge

[David FOXWELL <David.FOXWELL@xxxxxxxxx>]

I just used the merge source function for the first time.

I had to fix a bug on a programme currently undergoing modifications. This meant that there were 3 versions of the RPG source :

The version in production, a version that a developper is currently working on and my version.

I needed to update the production version and then copy my modifications in the other developper's version.

To merge my modifications am I right in saying you need to download the two sources into an iSeries project?

Anyway that's how I did it, then hit the button to insert all the modifications. That was the production library version taken care of. I was very impressed. I even found it hard to believe. So I uploaded the modified (merged) source and compared it again with the version on the i5. I guess I'll just have to trust it!

I then wanted to do the same with the other developper's version. The compare took a long time and I got the message that there were too many differences. It said to ignore the spaces or analyze separately the structures. I see in the preferences under workbench/ comparaison I can select ignore the spaces but I don't think that's going to make much difference. How do I analyze only parts of the source ?

Now I have to go through all my modifications using the date and insert them into the other source manually. It is rather delicate.

Any suggestions ?