Skip to content
← Code Compare

How can we improve Code Compare?

'remove/ignore svn diff lines in 3-way merge. eg <<<<<<< .working' has been merged into this idea

Code Compare

Categories

Automatic merge + remove lines such as "<<<<<<< .working"

Automatic merge for TFS 2010 requires manually setting up a batch file, which is cumbersome. Also, several people have reported problems with the merge even with the batch file workaround.

See http://forums.devart.com/viewtopic.php?f=36&t=23622 for more information.

31 votes

We're glad you're here

Please sign in to leave feedback
Signed in as (Sign out)
Close
Close

We’ll send you updates on this idea

StaffanW shared this idea  ·   ·  Report…  ·  Admin →

We're glad you're here

Please sign in to leave feedback
Signed in as (Sign out)
Close
Close
Submitting...
An error occurred while saving the comment
  • Brian Dahl commented  ·   ·  Report

    I use Diffmerge and they had a good automerge...
    I thnk you need some different automerge aspects:
    1. TFS
    2. SVN

    In SVN Mode you have to handle with the <<<<, and i don´t know how tfs it´s handle with different Versions.

    The other side is that you can interpretenting the code for used variables in the new code etc...
    Automerge isn´t the simplest way, but a good Automerge is on of the best arguments to selling....

  • AdminDevart (_, Devart) commented  ·   ·  Report

    Merged with idea: "remove/ignore svn diff lines in 3-way merge. eg <<<<<<< .working"
    Author: Oliver Dunthorne

    The diff "comment lines" are not part of my code, but they are compared as if they are

    >>>>>>> .merge-right.r2315
    // old code here
    <<<<<<< .working
    // new code here
    =======

  • Malc commented  ·   ·  Report

    I'd go for more than just removing all the chevrons and ='s... how about:
    Initially a simple empty marked conflict block via the conflict markers dropped by the scm merge. Right click or buttons to accept one other or both changes then edit.
    With the symbolic and block recognition code compate it might be possible to allow blocks of code to be pulled in sepparately, so the both option might allow finer grain than the all or nothing (or line by line) of other tools; but that would be a nice to have rather than a should.

    Obviously this would be good for more than just svn...