49 results found
-
Fix the issues with spaces in the user directory
If there are spaces in the user directory then you can't merge or diff, which is a pain.
7 votesSolved :)
-
Crowd-source your parsing engines
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 votesWe already started! Please contact the forum for more information – http://www.plasticscm.net/index.php?/forum/28-external-parsers/
-
Ignore whitespace around curly braces
It would be nice to have an option to ignore whether the curly braces around statements are placed on the same line or a new line, to ease merging after the VS editor automatically applied the preferred style of different developers.
if (foo) {
bar();
}vs
if (foo)
{
bar();
}or even
if (foo) { bar(); }
27 votesNew SemanticMerge able to skip format conflicts.
Check it out!
http://blog.semanticmerge.com/2014/05/skip-format-conflicts-with-new.html
-
Support merging across files
Right now the samples on the website about splitting up a class are a bit unrealistic since they all include splitting the class up but keeping it all in the same file. In reality, we often move code to different files and still want to merge. SemanticMerge will be revolutionary if it can solve this problem.
236 votesDear all,
We are happy to announce that we implemented your request of cross-file semantic merging.
It is really awesome and since strong git integration is a must, it is part of our new product: gmaster a full-featured Git client based on Semantic tech.
You can download it here:
And you can watch a video of cross-file merging in action here:
Enjoy!
-
Delphi/Pascal support please...!
Need support for Delphi Object Pascal pretty pretty please...!!
179 votesDone!
Please check http://www.plasticscm.net/index.php?/topic/1857-delphi-parser-development/
-
C++ support
It would be great to have C++ support
634 votesWe have included C++ support in 2.0.99.0!!!
Enjoy!
-
Semantic Merge needs to be smarted about unimportant changes
I think that when there are no changes but in whitespace (not within string literals of course) SM shouldn't show that there are any difference.
28 votesNew SemanticMerge able to skip format conflicts.
Check it out!
http://blog.semanticmerge.com/2014/05/skip-format-conflicts-with-new.html
-
Linux... please...
I was really excited about the project but disappointing when i realized I couldn't use it on Linux.
421 votes -
C support
The C programming language is it's own thing! And implementing it would be way easier than C++, with all its object-orientation and template metaprogramming and multiple inheritances! Let's make this happen!
173 votesDONE! It is available to download at www.semanticmerge.com :-)
-
F# Support
C#, F#, and Javascript are the 3 languages I use at work so having F# support would be awesome!
243 votesWe have a community contributed parser! :-)
https://github.com/sageserpent-open/SemanticMergeFSharpPlugin
-
Add a diff view when there is a merge conflict
When there is changes in source and destination, you could see :
- the code of the source and the diff with the source.
- the code of the destination and the diff with the destination.
The problem, is that you can't understand easily the problem without opening the first diff, then the second diff. And perhaps reopen the first diff,...
A better way to understand the merge problem would be to have in the right pane a view that display the "diff view" that show a typical diff with lines differences
123 votesA diff view within the SemanticMerge!
-
Ignore blank lines
Between methods different developers have different standards for number of blank lines (1 is correct, others use 2 or more). These show up in diffs, but they are not semantic differences.
42 votesNew SemanticMerge able to skip differences where only EOLs and indentation changed.
Check it out!
http://blog.semanticmerge.com/2014/04/new-semanticmerge-1061-is-out.html
-
Automatic installation of semantic merge for svn, git,tfs, ....
Can you install automatically the semantic merge tool on install or in a option dialog.
CodeCompare from devart does this already so it's much faster to setup and work with.
66 votesA new release (1.0.72.0 – Hamm) has been publish with support for this! Check it out!
-
Personal type of licensing for SemanticMerge
Maybe this is early question... But, when i requested license for beta , i've noticed "Valid for machine" line below the license code key. Will it remain for release? We live in era when we work everywhere and everytime, and not tied to particular machine. So personal licensing would be much more relevant and attractive for users.
32 votesWell, the Semantic licenses are tied to a machine, but we gave as many extra lics for extra machines as needed to the people purchasing Semantic… so it shouldn’t be a big issue anymore.
-
Keyboard shortcuts
To be able to use keyboard to go over differences or do the merge. The need to use a mouse makes the process much longer
77 votesWe have just launched a new release of SemanticMerge, check it out!
- Accelerator keys have been implemented for every button.
- Use the keyboard to go over differences.
- Current window can be closed using the Esc key.
And we will improve more in conflicts for next release too ;)
-
Drag and Drop Files
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 votesReleased in 1.0.43 version! The user can drag and drop files to the diff/merge launcher window textboxes instead of selecting the files using the browse button. Enjoy it!
-
Refresh button
Many other diff tools allow you to refresh/reload code (ie: if you make small changes and you'd like to re-diff).
Currently, you need to close and re-open the tool.
38 votesA new button (“restart diff”) in semantic diff tool is available to allow you to refresh or reload the code.
-
Tutorial for tortoise
Please provide a configuration tutorial for tortoiseGit ad TortoiseHg.
12 votesThe documentation is available at http://www.semanticmerge.com/index.html#documentation, greatly improved!
-
SVN please
Title says it all. I'm hoping that this can be configured with SVN in the future.
18 votes -
Add Mercurial configuration documentation
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
- Don't see your idea?