semanticmerge

semanticmerge

Categories

JUMP TO ANOTHER FORUM

  1. Lets say I have a C# file that I have auto formatted to use spaces. Some other developer has auto formatted it to use tabs. This shows up as a merge conflict. I have to view the diff and choose "Ignore White Space and EOL" and semantic merge then marks it as "Resolved".

    It would be nice if semantic merge always did this or at least provided a command line switch that lets us turn this on if we want to. This way I can add it to my .gitconfig file if I know I will be working in a…

    27 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    4 comments  ·  Flag idea as inappropriate…  ·  Admin →
  2. It would be nice if there was documentation on how to use the tool with Mercurial. See http://mercurial.selenic.com/wiki/MergeToolConfiguration

    19 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    completed  ·  1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  3. Seeing as you are already talking about using this with other source control systems, I assume you will have separate pricing & availability from PlasticSCM.

    I always liked the look of XDiff & XMerge, but AFAICT they are only available as part of PlasticSCM. We use subversion & TFS, so there's no way I could purchase PlasticSCM licenses purely to get access to the diff tools!

    Thanks!

    18 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    completed  ·  4 comments  ·  Flag idea as inappropriate…  ·  Admin →
  4. Title says it all. I'm hoping that this can be configured with SVN in the future.

    18 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    completed  ·  2 comments  ·  Flag idea as inappropriate…  ·  Admin →
  5. If I run a git difftool on a file that exists now but did not in a previous commit (was created), the destination file does not exist and causes semanticmerge to throw several errors

    14 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  6. Something small, I like being able to drag and drop files into the diff tool and into the file selection menu. Sometimes I work in multiple branches of the same code base and drag and drop makes it easy to compare the different versions quickly.

    13 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  7. When I'm trying to use it with Visual Studio on my computer for compare task, the startup time is around 10s which is far too long if I want to use it.
    (remark: I'm happy to have only one instance running if needed to speedup time)

    13 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    completed  ·  2 comments  ·  Flag idea as inappropriate…  ·  Admin →
  8. Everyone seems to want language 'x' supported, you will never keep up, create a framework and host plugin examples on github, this will also allow meta-languages (e.g. creative (ab)use of the C pre-processor) to be supported.

    13 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  9. When I select Ignore blank lines and/or whitespace, the program does not remember this so I have to set it all over again the next time. This is tiresome and a time waster because the initial diff is useless without the right settings.

    12 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  10. Passing the right parameters and properly escaping for a external tools is tedious and prone to shell expansion.

    The integration of external merge/diff tools with Semanticmerge should be done via the GUI and should be persistent across sessions.

    The GUI should have hints (tooltip or a contextual help button) about the possible names and titles placeholders (i.e.: describe what #sourcefile, #destinationfile, #basesymbolic etc. expand to) so it's easy for users to configure third party tools based on their documentation.

    Extra bonus points if there is a preview text box where the commands entered by the user is expanded to show…

    12 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    0 comments  ·  Flag idea as inappropriate…  ·  Admin →
  11. Please provide a configuration tutorial for tortoiseGit ad TortoiseHg.

    12 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    3 comments  ·  Flag idea as inappropriate…  ·  Admin →
  12. Enable the text-diff view right in place with the Semantic Diff Window. Right now, I always have to click "run text diff" every time I want to compare the changes.It would be much easier if I could click on a class or method and it would show me the changes right there on the left side, in two neat windows.

    9 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    2 comments  ·  Flag idea as inappropriate…  ·  Admin →
  13. If there are spaces in the user directory then you can't merge or diff, which is a pain.

    7 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    2 comments  ·  Flag idea as inappropriate…  ·  Admin →
  14. you may already do this - but the tool should perform a text based merge if it cannot do a smart merge for a given file.

    7 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    completed  ·  3 comments  ·  Flag idea as inappropriate…  ·  Admin →
  15. It should be possible to set the different merge options in a config file or via the parameters (in mercurial.ini or something like that).

    Running a big merge with a lot of whitespace issues forces me to options> comparison >"ignore EOL and whitespace" hundreds (!) of times as it is not sticky between merges.

    6 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  16. Preference needed. (Save ignore whitespace settings, set external text compare software, etc.)

    4 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  17. Please provide a configuration tutorial for tortoiseSvn

    3 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    completed  ·  2 comments  ·  Flag idea as inappropriate…  ·  Admin →
  18. I think my team would find this really useful however we use Perforce so support for that would be great!

    3 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    completed  ·  1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  19. If I have a set of changes in a few methods, currently I have to select each change and click on the "diff" button to see the diff window at the bottom.

    It would be nice to be able to "Pin" the diff window to the bottom of the screen and have it update automatically as I move through the changes.

    3 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    1 comment  ·  Flag idea as inappropriate…  ·  Admin →
  20. Since there is no semantic difference between different ways of code formatting, there is no point in forcing people to format there code in a certain way. Code could be checked in without formatting and checked out with the formatting that the developer wants. Put an end to the endless code formatting discussions and make tools like StyleCop redundant.

    3 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    3 comments  ·  Flag idea as inappropriate…  ·  Admin →
  • Don't see your idea?