Page 1 of 4 123 ... LastLast
Results 1 to 10 of 35
  1. #1
    Guest

    Default Beyond Compare as a merge tool for Team Foundation

    Hi,

    I configured BC as the diff tool for Team Foundation as described in the KB article.
    I also configured it as the merge tool, but each time I close it, I get an error message saying "The manual merge for <file name> has been canceled".

    Any ideas?

    Thank You,
    Shay

  2. #2
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    4,758

    Default Re: Beyond Compare as a merge tool for Team Founda

    I haven't heard reports of this error from any of our users yet. So far I've only heard from those using BC as a diff tool with Team Foundation, not as a merge tool.

    What steps did you take to configure BC as a merge tool?
    Chris K Scooter Software

  3. #3
    Join Date
    Jul 2006
    Posts
    2

    Default Re: Beyond Compare as a merge tool for Team Founda

    Basically, its very similar to configuring BC as a diff tool.
    In the "Configure Tool" dialog, I've entered the following:
    Operation=Merge
    Command=C:\Program Files\Beyond Compare\BC2.EXE
    Arguments:%1 %2 /title1=%6 /title2=%7

    BC is launched and performes the merge but when I close it it seems like the return value causes Team Foundation to display an error message and cancel the merge operation.

    Thank You,
    shay

  4. #4
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    4,758

    Default Re: Beyond Compare as a merge tool for Team Founda

    I found a good article on this at MSDN blogs:

    http://blogs.msdn.com/jmanning/articles/535573.aspx

    The variables %1 and %2 are only the files to compare. You'll need to specify %4 in the argument to BC as the file for saved changes. Without this, changes won't get saved to version control.

    For merge, try using
    Arguments:%1 %2 /savetarget=%4 /title1=%6 /title2=%7

    This will make a save in the left or right pane save to filename %4.
    Chris K Scooter Software

  5. #5
    Join Date
    Jul 2006
    Posts
    2

    Default Re: Beyond Compare as a merge tool for Team Founda

    Thank you,
    Worked like a charm...

    Shay

  6. #6
    Guest

    Default Re: Beyond Compare as a merge tool for Team Founda

    Thank you for this hint,

    I wonder if it should not be included in the "official" list


    Garpur

  7. #7
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    4,758

    Default Re: Beyond Compare as a merge tool for Team Founda

    Garpur,

    Thanks for the suggestion. I added this to our Version Control page.
    Chris K Scooter Software

  8. #8
    Join Date
    Aug 2008
    Posts
    7

    Default

    Which Version Control page are you guys referring to?

  9. #9
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    2,529

    Default

    ZoŽ P Scooter Software

  10. #10
    Join Date
    Aug 2008
    Posts
    7

    Default No good

    I just switched to 3.0 and its not working with TFS2008 :-(

    When I do merges it says that the merge has been canceled.

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •