I just wondered if anyone had any experiencing configuring AnkhSVN to use kdiff3 as its merge tool.
I know it can be changed in Visual Studio 2010 at Tools -> Options Subversion User Tools but I'm not sure what the correct command lines are for Diff, Merge and Patch.
I have searched the net but to no avail.
You should be able to select KDiff3 from the dropdown, so there's no need to manually configure it.
Related
Please suggest the option of Uninstalling the GIT Source Control Provider. I've never used it and have used TFVC for many years. I have no intention of ever using GIT but today when I added a project to source control it went to GIT instead of TFVC even though my default provider was and always has been Visual Studio Team Foundation Server
I've never used it and have used TFS for many years. I have no intention of ever using GIT
Don't presuppose of the future! 😉
There is a big switch movement for a reason (even Microsoft switched to it internally). Perhaps you should have a careful look at it because it brings a lot more flexibility and other things that could improve your development workflow.
Also FYI, the right term is TFVC, not TFS (which is the whole ALM solution and that could host TFVC or git repositories) .
Anyway...
You must not uninstall git tool but uninstall git plugin of visual studio. There are some solutions proposed (remove some registry keys or rename extension file) here:
How can you disable Git integration in Visual Studio 2013 permanently?
I use VS 2017 and I want to view a file changes in meld from visual studio, or call meld for file from Visual Studio comfortably. How can I do this?
While I can't say if VS 2017 behaves the same as VS 2019 in that regard, VS 2019 seems to respect the Git settings.
Meld can be configured as the default diff and merge tool for Git, as explained here.
It is also possible to configure it for Tortoise set of tools, as explained here, should you wish to use that as an alternative for managing Git repositories.
If you are using a different source control provider, hopefully the above examples with syntax will help you figure out the correct configuration in Visual Studio.
Effectively, the variables needed are: %base %mine %theirs %merged
along with options --auto-merge --output --diff.
Meld Diff lets you use meld to compare files or folders from visual studio code directly. This extension open two files (or folders) in the external tool meld.
To install, launch VS Code Quick Open using (Ctrl+P), paste ext install danielroedl.meld-diff, and press enter.
Checkout the documentation here.
I don't think there is Visual Studio support for meld, but you have some alternatives.
You can use the integrated tools to view file changes.
You can use it like this in cmd:
devenv /Diff SourceFile, TargetFile, [SourceDisplayName],[TargetDisplayName]
Next to that there are also some addons such as this one which offer some comparison functionality
I'm using Visual Studio 2010 with VisualSVN and TortoiseSVN, and would like the option of being prompted to update from source control whenever I open a solution, the way SourceSafe did. Is that possible?
to update from source control whenever I open a solution, the way SourceSafe
I think this update option is not a SourceSafe feature but rather it is the Get everthing when opening a project or solution option found in the Visual Studio source control options panel.
When Visual Studio connects to SourceSafe it does so using the MS-SCCI.
So if you use a MS-SCCI Subversion plugin this should also happen whenever you open a project or solution.
For example the Agent SVN is an MS-SCCI Subversion plugin and it should work this way.
You will have to build an extension for VS which will use the TortoiseSVN automation API ( http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-automation.html ) and do the update when you open a solution:
Or modify existing extensions ( integrations) like AnkhSVN to do that.
I don't think it has a way to auto-prompt you, but have you tried the AnkhSVN Visual Studio Subversion Plugin? It allows you to easily update solutions, add to, etc.
I'm currently working on .Net projects that are using either Git or Mercurial (Hg) source controls. I use Visual Studio 2010 for all of these projects. As I often have to switch source control providers I was wondering if there's a quick way to do this, so I don't have to go Tools -> Options -> Source Control once an hour.
A much better solution would be if Visual Studio would recognize which source control provider it needs or maybe remember which provider was used for a certain project. Can that be done?
With a nudge in the right direction I managed to handle this problem even better then expected - no switching necessary.
For Mercurial solutions I use VisualHG and for Git I use Git Source Control Provider. I also installed HgSccPackage. Now I don't really know how or why this works, but I've got GitSCC selected as the Source Control Provider in the settings, but when I load a Mercurial project VisualHG takes over. All I have to do is set the SCC to VisualHG the first time I open the project, close the project, change back to GitSCC and when the project is reloaded VisualHG will be used for it.
Interestingly it does not work without HgSccPackage installed. If someone can explain this, please do.
Note that it does not seem to work the other way round.
I use Git in combination with VS 2010 by keeping a commandline screen open. I do my work in Visual Studio and when I'm ready to make a commit, I switch to the commandline screen.
If you do this, you can use Git and Mercurial side by side in combination with VS 2010.
Version Control noob alert
I've already installed both Mercurial, TortoiseHg and VisualHG into Visual Studio 2010. I've set in Visual Studio my source control to Mercurial.
When I right click on my solution, I already see HG's buttons in the context menu that appears there.
My question now is, how do I make this version control thing work? It seems I'll have to make some kind of configuration before, as it tells me "Solution is not under Mercurial version control" when I click in "HG Status".
Thanks
with tortoiseHG you can rightclick on an explorer window and do tortoiseHG -> Create Repository Here which runs hg init for you. I believe currently there is no way to run hg init from visualHG.
TekPub has a good free video for using Mercurial with TortoiseHG, VisualHG, and VS along with pushing the repository to the public via CodePlex. In it, Rob Conery shows how to create a repository in your VS solution and how to work with commits, branches, merging, etc.
It's especially good for those coming from a Subversion background because he points out how branches/merging/forking is not so challenging in Mercurial as it's been known to be in Subversion.
YouTube link as other link is dead:
https://www.youtube.com/watch?v=HV8e1NQ-8gU
Not sure how to do this within Visual Studio but it is easy to do from the command line. Just
exit VS and go to a command prompt at the root folder of the project(s) you want to put under source control and type "hg init". Then load the solution and verify that hg is the selected source code provider.