BC3 and IBM rational Clear Case

Collapse
X
 
  • Time
  • Show
Clear All
new posts
  • DRMCMTR
    New User
    • May 2013
    • 2

    BC3 and IBM rational Clear Case

    We are using BC3 within Clear Case.

    Do you need the BC3 PRO version to do a merge of code resource?

    The two way compare issues an error in CC after the merge was completed.
    This error does not appear when we try the merge with the PRO version (3 way).


    Has anyone had this issue with the std version and CC?


    Error:

    Error Checking in "d:\DC\.........newtest.xml".
    Merging Changes from the latest version on the branch failed.
  • Aaron
    Team Scooter
    • Oct 2007
    • 16007

    #2
    Hello,

    A merge with 3 inputs and a 4th output would require BC3 Pro for the Text Merge session support. We have documentation available here:
    http://www.scootersoftware.com/support.php?zz=kb_vcs#cc

    If Clearcase offers an alternative method of defining a diff or merge tool, you could attempt to use BC3 Std's "/savetarget" for a 2 input and one output merge, but I do not believe Clearcase supports this. Other 'merge' program examples that do support this can be found in the above VCS article.

    Any machine licensed for Std can revert to trial mode in order to test Pro features:
    http://www.scootersoftware.com/suppo...?zz=kb_evalpro

    Our list of Pro features (including 3-way Text Merging) is found here, if you would like to test any others:
    http://www.scootersoftware.com/shop.php?zz=kb_editions
    Aaron P Scooter Software

    Comment

    • DRMCMTR
      New User
      • May 2013
      • 2

      #3
      Do you recall this post: http://www.scootersoftware.com/vbull...ead.php?t=7207

      This seems to be the same similar error/problem. I was wondering if this issue was resolved.

      Comment

      • Aaron
        Team Scooter
        • Oct 2007
        • 16007

        #4
        Originally posted by DRMCMTR
        Do you recall this post: http://www.scootersoftware.com/vbull...ead.php?t=7207

        This seems to be the same similar error/problem. I was wondering if this issue was resolved.
        Are you running into this error using BC3 Pro? The last update on that thread was to enable a "Follow Symlink" option, which is off by default but might need to be on in this case?

        This thread is also referencing a folder comparison. Are you comparing files or folders? The VCS article and "3-way merging" only refers to the file level. To clarify, "3-way Text Merge" is for merging three text files, not three folders.
        Last edited by Aaron; 09-May-2013, 03:20 PM. Reason: Update
        Aaron P Scooter Software

        Comment

        Working...