Cleardiffmrg/bin_merge problems
- Told Andrew about new -reuse_stream option to create_dev_snapview.pl. I have him testing this
- Worked with Shivdutt and IBM/Rational on problem with cleardiffmrg. I think I've worked this out to the leading "/" that UCMCustom users.
- Finished stripmime - Ray testing it - created stripmimed that logs to /tmp.
- Worked at getting bin_merge integrated into UCMCustom.pl
- Implemented quick script (topper) to try to catch the hanging problem with ccase-rmna-3
Cleardiffmgr problem
The problem occurs during a deliver between projects where there is a merge conflict and UCMCustom wants to have findmerge call up a Cleardiffmgr to resolve the conflicts. I've seen this before WRT snapshot views and view tags with forward slashes at Ameriquest. UCMCustom perfaces' the vob tags with "/".
But this problem doesn't always happen - in fact most of the time it appears to work. It might be just when there's a merge conflict
After working with Shivdutt and IBM/Rational on the problem and getting down to reproducing it with a long cleartool findmerge command in the user's environment this problem started happening to me in my test environment as I was integrating bin_merge. After much narrowing down I found:
Here's some more information. As you know I started having a similar problem as the end user. I paired it down to the following. This fails (but does not always fail):
Z:\andys_pvob>cleartool findmerge /andy\bin\cygwin_setup -fver \main\Andrew_Integration\6 -log NUL -gmerge -nc
Needs Merge "/andy\bin\cygwin_setup" [to \main\Andrew_Integration\Andrew2_Integration\CHECKEDOUT from \main\Andrew_Integration\6 base \main\Andrew_Integration\5]
However the following does work:
Z:\andys_pvob>cleartool findmerge \andy\bin\cygwin_setup -fver \main\Andrew_Integration\6 -log NUL -gmerge -nc
Needs Merge "\andy\bin\cygwin_setup" [to \main\Andrew_Integration\Andrew2_Integration\CHECKEDOUT from \main\Andrew_Integration\6 base \main\Andrew_Integration\5]
Notice the difference? It's subtle. The first findmerge's path starts with a "/" while the second one starts with a "\".
bin_merge integration
My bin_merge script remains it's own process. This will be useful if others wish to use this process. However UCMCustom needs to incorporate calling bin_merge. I'm currently having a problem with this because I want to start bin_merge as a pipe so I can give the user feedback. But bin_merge runs to completion before the first output is received. I don't know why this is happening as it doesn't happen in a smaller test.pl environment, only under the massive UCMCustom.pl...