Question

I’m writing a script to automate some merge operations and I’d like to do it using this command:

cleartool findmerge file_name -fver /main/branch_name/LATEST -merge -log NUL -c "Automatic merge"

The thing is, sometimes I get this message and I have to press enter to continue the process:

Needs Merge "file_path" [to _branch_ from _another_branch_ base _yet_another_branch_]

Any way to avoid this?

Answer 1

The problem with findmerge, as this technote describes, is that it can report back inconsistent “Needs Merge” depending on the location of merge hyperlinks.

And that isn’t likely to be fixed anytime soon:

This requires significant architectural change and will not be addressed in the next 18 months.
Please work with Rational Customer Support to learn UCM best practices to get around this is the limitation.

I haven’t found an easy solution:

I usually findmerge on directory first (-type d), which don’t have that extra message issue.
Then if all the directories are merges, I go on on files, with -merge -abort (to stop at the first conflict): since your merge shouldn’t have any conflict in the first place, that mode (-merge -abort) is less likely to report the “Needs merge” message.