Patch-ID# 103333-01 Keywords: historic complicate conflict cputime consume bringover resolve ld_run_path Synopsis: SPARCworks TeamWare 1.0.4: bringover gives a file conflict Date: Apr/19/96 Solaris Release: 2.3 and above SunOS Release: 5.3 and above Unbundled Product: SPARCworks/TeamWare Unbundled Release: 1.0.4 Relevant Architectures: sparc BugId's fixed with this patch: 1233507 1241543 Changes incorporated in this version: 1233507 1241543 Patches accumulated and obsoleted by this patch: Patches which conflict with this patch: Patches required with this patch: Obsoleted by: Files included with this patch: SUNWspro/CodeManager/bin/bringover SUNWspro/CodeManager/bin/codemgr SUNWspro/CodeManager/bin/putback SUNWspro/CodeManager/bin/resolve SUNWspro/CodeManager/bin/workspace SUNWspro/CodeManager/bin/ws_undo Problem Description: 1233507 504077 5.4 bringover gives a file conflict if complicated historic and huge change 1241543 5.3 resolve isn't built with LD_RUN_PATH Patch Installation Instructions: -------------------------------- Refer to the Install.info file for instructions on using the generic 'installpatch' and 'backoutpatch' scripts provided with each patch. Any other special or non-generic installation instructions should be described below as special instructions. Special Install Instructions: ----------------------------- None.