Skip to content

semanticmerge

semanticmerge

Categories

JUMP TO ANOTHER FORUM

(thinking…)

The merge tool that understands your code

You've used all your votes and won't be able to post a new idea, but you can still search and comment on existing ideas.

There are two ways to get more votes:

  • When an admin closes an idea you've voted on, you'll get your votes back from that idea.
  • You can remove your votes from an open idea you support.
  • To see ideas you have already voted on, select the "My feedback" filter and select "My open ideas".
(thinking…)

Enter your idea and we'll search to see if someone has already suggested it.

If a similar idea already exists, you can support and comment on it.

If it doesn't exist, you can post your idea so others can support it.

Enter your idea and we'll search to see if someone has already suggested it.

10 results found

  1. Make the merge understand the semantics of the code

    I was fairly disappointed to try out the example found in AppData\Local\PlasticSCM4\semanticmerge\samples\CSharp\AclInfoPrinter

    When using the merge, it was clear that only a rudimentary understanding of the code is still absent.

    In the src.cs I add a "new PrintableEntry()", say on line 49. I forget the ";" and is being told that it is missing. The illusion has started. I add the ";"

    Then in the dst.cs I rename the class PrintableEntry to PrintableEntry2

    But when looking at the resulting file of the merge, line 49 does not contain "new PrintableEntry2" as expected.

    where are the semantics in this??

    1 vote
    Vote

    We're glad you're here

    Please sign in to leave feedback
    Signed in as (Sign out)
    Close
    Close
    You have left! (?) (thinking…)
    0 comments  ·  Admin →

  2. Quit prompting me for text files. Make it so I can turn it off after it prompts.

    See title for more information.

    1 vote
    Vote

    We're glad you're here

    Please sign in to leave feedback
    Signed in as (Sign out)
    Close
    Close
    You have left! (?) (thinking…)
    1 comment  ·  Admin →

  3. Remember where the splits are

    When in the Visual Diff tool, I would like a bit more control over where the split is for the diff.

    When doing a big code review with Git, the bottom split (where the diffs are) resets for each file. It would be really nice if it remembered where I put the split at.

    3 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback
    Signed in as (Sign out)
    Close
    Close
    You have left! (?) (thinking…)
    0 comments  ·  Admin →

  4. Solaris support

    Support for running the merge tool on Solaris. This should be easy given you already have Linux support

    3 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback
    Signed in as (Sign out)
    Close
    Close
    You have left! (?) (thinking…)
    1 comment  ·  Admin →

  5. Terminally slow performance on large files due to single threaded operation, UI updates

    I tried to diff two large (4 MB) WCF generated proxy files. The merge tool got stuck at 12% CPU usage on my i7 machine for over 10 minutes, displaying no UI at all. Using Process Exploer, I found that only the program's main thread was busy. The thread's call stack revealed that all the time was spent inside PresentationFramework.dll. You can fix this by performing the diff on the background, eg. using TPL, and by updating the UI asynchronously,eg using asynchronous bindings or update the UI when all data changes are complete. You can also use Reactive extensions to…

    6 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback
    Signed in as (Sign out)
    Close
    Close
    You have left! (?) (thinking…)
    1 comment  ·  Admin →

  6. Go straight to normal diff tool on unsupported file extensions

    Do not show a message box for unsupported file extensions, go straight to the traditional diff/merge tool.

    6 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback
    Signed in as (Sign out)
    Close
    Close
    You have left! (?) (thinking…)
    0 comments  ·  Admin →

  7. Multiple file extensions confuse semanticmerge

    Files ending with multiple extensions eg: .xaml.cs throw an error saying the type is not supported, even though it's just a .cs file.

    13 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback
    Signed in as (Sign out)
    Close
    Close
    You have left! (?) (thinking…)
    1 comment  ·  Admin →

  8. Group the semantic differences by file instead of by type of change

    The semantic differences are now first grouped by type (added, changed, deleted) and then by file. I would rather see this the other way around. So first group by file and then by change type.
    Or even better, have the option to select the desired grouping.

    4 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback
    Signed in as (Sign out)
    Close
    Close
    You have left! (?) (thinking…)
    1 comment  ·  Admin →

  9. JavaScript

    JavaScript support would be amazing.

    37 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback
    Signed in as (Sign out)
    Close
    Close
    You have left! (?) (thinking…)
    2 comments  ·  Admin →

  10. Selection of font sizes is inconsistent

    (First of all, great tool! I'm loving it so far.)

    In the diff tool, the configure fonts and colors screen shows a different font size than the one I select in the font dialog that appears when clicking on "Change."

    Example: (Consolas, Regular)
    - If I pick size 9, the resulting font is Consolas, 9pt (ok)
    - If I pick size 10, the resulting font is Consolas, 9.75pt (wrong)
    - If I pick size 11, the resulting font is Consolas, 11.25pt (wrong)

    5 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback
    Signed in as (Sign out)
    Close
    Close
    You have left! (?) (thinking…)
    declined  ·  1 comment  ·  Admin →
  • Don't see your idea?