semanticmerge

semanticmerge

Categories

JUMP TO ANOTHER FORUM

  1. Please add support for PHP.

    120 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 →
  2. Please add support for c# 7

    33 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 →
  3. While uprgading to Debian 8 Jessie (current stable, released in May 2015), I had to uninstall semanticmerge due to conflicts. I can't reinstall semanticmerge again due to missing dependencies.

    All packages listed with 'INDISPONIBIL' are unavailable, although the semanticmerge repo is available:

    --\ Depinde (10)

    --- default-jre
    
    --\ plasticscm-gnome-sharp (= 2.24.0) (INDISPONIBIL)
    --\ plasticscm-gtk-sharp (= 2.12.21) (INDISPONIBIL)
    --\ plasticscm-libmono3-corlib2.0-cil (= 3.0.3.1-1.1) (INDISPONIBIL)
    --\ plasticscm-libmono3-system-data2.0-cil (= 3.0.3.1-1.1) (INDISPONIBIL)
    --\ plasticscm-libmono3-system-runtime2.0-cil (= 3.0.3.1-1.1) (INDISPONIBIL)
    --\ plasticscm-libmono3-system-web2.0-cil (= 3.0.3.1-1.1) (INDISPONIBIL)
    --\ plasticscm-libmono3-system2.0-cil (= 3.0.3.1-1.1) (INDISPONIBIL)
    --\ plasticscm-mono3-runtime (= 3.0.3.1-1.1) (INDISPONIBIL)
    --\ plasticscm-mono3-runtime-sgen (= 3.0.3.1-1.1) (INDISPONIBIL)

    --\ Sugerează (1)

    --\ libclang1 (= 3.2) |
    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 →

    Hi Eddy!

    Thanks for your outstanding interest in semanticmerge! We’re sorry to see that you experienced this issues under Debian 8. As you discovered, this new version caused a dependencies issue which prevented semanticmerge to be installed using the older Debian 6 repository.

    However, we’re very happy to tell you that we’ve set up a brand new Debian 8 repository to solve this problem! To successfully install semanticmerge under Debian 8 please update your sources.list file using this lines:
    deb https://www.plasticscm.com/plasticrepo/plasticscm-common/Debian_8.1/ ./
    deb https://www.semanticmerge.com/semanticrepo/Debian_8.1/ ./
    Once you’ve done this please update your repository cache:
    apt-get update
    Now you can upgrade your semanticmerge version:
    apt-get install semanticmerge

    We’ll update the package installation page as soon as possible.

    Please don’t hesitate to contact us if you find any additional issue, and thank you very much for your feedback!

    Regards,
    Miguel

  4. If you could have support some sort of extensibility the community would have already added all the other languages you want.

    3 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 →
  5. 2 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 →

    Hi!

    Plugins for TeamCity and Jenkins are available to download in our download page and through the Jenkins plugins page. Please let us know in our forum if you bump into any issues or to share your feedback!

    Regards,
    Miguel

  6. it would be nice to save the position of the window (multiple monitors) and its state (fullscreen etc). if this kind of user personalizations is integrated you could also save the positions of the splitters inside the window.

    1 vote
    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 →
  7. 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 →
  8. Pretty obviously needed

    1 vote
    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 →
  9. I've integrated Semantic merge in to TFS as described in the guide. The compare works.
    But When I "Right Click => Compare" both files are read only.
    I would like to be able to modify the files.

    1 vote
    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 →
  10. 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 →
  11. 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 →
  12. When comparing C# 5 files with async and await keywords, an error dialog pops up saying "The following parsing errors have been found, the trees could be inconsistent".

    The parsing errors are on functions that use the async / await keywords.

    Expected bahaviour: C# 5 has been out for a while now, so should be correctly parsed.

    101 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. 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 →
  14. 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 →
  15. 44 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 →
  16. I'd love to use this sort of like how I use hg grep to find the history of a method in Hg.

    3 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 →
  17. 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 →
  18. 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 →
  19. 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 →
  20. 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 →
← Previous 1 3
  • Don't see your idea?