Formatting merge messages with tsvn:* properties in tortoisesvn - tortoisesvn

I use tortoisesvn 1.7.10 Build 23359 - 64 Bit.
http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-dug-propertypage.html
This manual says, that tortoisesvn has it's own project properties, starting with tsvn:.
Some of them are "tsvn:mergelogtemplatetitle" and "tsvn:mergelogtemplatemsg"
But I can't see them in property editor of svn directory.
I use context menu of root directory that was checkouted from svn. Press "Properties". Then "New" - "Advanced" and I see
https://tortoisesvn.net/docs/nightly/TortoiseSVN_en/images/PropertyAdd.png
And there's no such tsvn properties.
These links says that this ability was added in May, 2012:
one,
two.
May be, it was added to 32-bit version only?
How to find them?

As Stefan has said in comments above, I need just to type the property name in the box, even if it isn't shown in the dropdown.

Related

TortoiseSVN Slow Diff [duplicate]

I've noticed an immense delay (just sitting there doing nothing) since upgrading to the latest version of windows while using tortoiseSVN to compare any file to its base version [TortoiseMerge].
I was on the fast track and got the fall creators update about a month ago and noticed this too so i reverted back and it went away. After it hit RTM I thought this was fixed but apparently I was wrong.
What do I mean with very slow?
Before fall creators update: <1 second
After: A minute or 2, as long as it takes..and that's just for comparing 1 file.
I just go read an article or something and wait for the tortoiseMerge icon to popup in the taskbar.
Repo is on my Desktop - Client is on my Laptop - same network.
Anyone with a similar experience? Did anyone find a workaround?
Edit:
The issue has more to do with TortoiseMerge than TortoiseSVN or SVN itself - I switched to Beyond Compare and it is working well for now.
The issue is already reported to Microsoft and Microsoft fixed in in Visual Studio 2017 15.6 when you recompile your code. Here the fixed MFC without the slow Get/SetPixel is used.
To fix in in Windows 10 for current and older compiled tools which use MFC, Microsoft released the Update KB4058258. The release notes don't mention the fix, but it is confirmed by the reporter that the fix is part of the cumulative update.
So installing the Update should fix it. So if you have the issue, make sure you run at least Build 16299.214 (run winver.exe to see the number).
If you have this or a higher number at last position, the issue should be gone.
The old and outdated information are archived. See the revisions of this answer for the old workarounds.
Instead of removing the "ribbon" setting, or changing security in Windows, I installed the last nightly build (1.9.9.x), and the performance is back.
I looked at the settings, and the ribbon is still checked as default. But the performance is there.
https://nightlybuilds.tortoisesvn.net/latest/x64/full/
As a workaround, you can use the TortoiseUDiff tool instead. It is still fast. Here is what I do:
Right-click a working folder in Windows Explorer and click 'SVN Commit'
Select one or more files in the 'Commit > Changes made' list
Right-click the selection and select "Show changes as unified diff"
It's not as powerful as TortoiseMerge, but if you just need to see the changes you are committing, the above method still works fast.
After installing 2018-01 Cumulative Update for Windows 10 Version 1709 for x64-based Systems (KB4058258) the speed problems for WinMerge appear to be completely fixed.
In the TortoiseSVN settings window, I
selected Diff Viewer/Merge Tool section
checked External
selected WinMerge.
Works like a charm.
It did a trick for me. I allowed TortoiseSVN program in my antivirus firewall protection settings. It made SVN Commit fastest.
Go to your antivirus. I have Quick heal. So I will tell you the steps accordingly.
1) click on "Internet & Network"
2) Click on "Firewall protection"
3) Check for "Program rules" and click on "Configure" button.
It will open a window displaying the list of allowed Exe on your system.
Your antivirus blocks tortoiseSVN and related exes, if they are not in
allowed Exe list.
4) So now click on "add" button, open dialog box will popup.
5) Go to "C:\Program Files\TortoiseSVN\bin" directory
6) Select TSVNCache.exe, TortoisePlink.exe, TortoiseProc.exe, ConnectVPN.exe And
click "open" then click OK in list window.
Here you go. Hope it helps you.

How to add gvim icon to openwith menu

I have installed gvim in windows 7. When I right click on a file, I get list of editor to be opened with. I see a icon for notepad++, 7zip and beyond compare, but not for vim. it is tough to search "Edit with Vim" in the big list. Is it possible to add icon to "Edit with Vim". I tried setting ICON in registry to gvim.exe path, but that didn't work
I am currently having a crack at coding this up "for real" (but no success yet).
In the meantime, here's what I did on my machine as a sort of workaround:
Create a new text file and call it (for example) vim.reg
and paste this into the file:
Windows Registry Editor Version 5.00
[HKEY_CLASSES_ROOT\*\shell\Edit with Vim]
"Icon"="\"C:\\Program Files (x86)\\Vim\\vim74\\gvim.exe\""
[HKEY_CLASSES_ROOT\*\shell\Edit with Vim\command]
#="\"C:\\Program Files (x86)\\Vim\\vim74\\gvim.exe\" \"%1\""
and then right-click on the file and select Merge.
Or just manually add those keys directly in RegEdit if you're comfortable with that.
You may need to restart Explorer.exe (eg. log out and back in) for it to take effect.
This will add a new "Edit with vim" entry, with the icon, to the context menu for every filetype.
If you want it only for text files, for example, then change the two occurrences of "*" in the file to "txtfile".
The other vim context menu entries (eg. open with existing vim session) will not be affected - they will still not have icons.
UPDATE:
From the bug report that Christian mentioned, it looks like someone else has now implemented this, in version 7.4.724.
Vim.org reports that the currently release is 7.4.729, so it should include that.
The only trouble is that the Windows binaries available for download from the site are from 2013.
But vim.org also suggests a way to get the latest version, precompiled for Windows:
For the latest version with all patches included see Cream below.
These versions are unofficial, but the download number is high and
complaints are few.
And
For an unofficial version that does include all the latest patches and
optionally a bit more: Cream.
The "one-click installer" mentioned includes the Cream changes.
For the "real Vim" use the "without Cream" version listed further down.
As far as I know, this is not possible yet. There is a whishlist bug that requests this feature, but no one has contributed code yet.

How to add a default include path in MSVC++ 2012?

I would like to add an include and library path to the default configuration in VC++ 2012. I know I can add it manually per project, but there is a checkbox "Inherit from parent or project defaults". I would like to modify this "project defaults" so it applies to all my projects.
Any clue of where to edit this?
***EDIT
No, that answer doesn't help. I edited the vsvars32.bat file, run the bat to check that INCLUDE and LIB variables where updated with my own path (and they are), but when I start MSVC++ 2012 my added path is not included.
It's a bit of a pain, and there is a blog post on MSDN that explains in detail, but in summary here's how you do it:
Open a project, any project.
From the menu, choose View / Property Manager (near the bottom of the menu)
In the property manager window, expand the project tree to show Debug and Release nodes
Expand either Debug or Release (it doesn't matter which)
Right-click on Microsoft.Cpp.Win32.user
Choose Properties from the pop-up menu
You should see a dialog where you can edit the VC++ Directories entry like this:
Once you OK through everything, any project you create or load will inherit these defaults.

TFS 2012 build definition: Parameter Items to Build: cannot convert value Microsoft.TeamFoundation.Build.Workflow.Activities.BuildSettings

After a lot of editing of my build templates (I recreated them in 2012 to avoid any issues.. but then I suppose I got sloppy and simply copy/pasted whole blocks from the old workflow, and I suppose that must have completely destroyed my versioning) I now have problems with just one build definition based on the build template I edited. (All other ones seem to be working fine.. so I suppose that one got a problem during all the editing. (I was mostly adding and removing Version=11.0.0.0 to the assemblies in the build template))
The exact error is:
Parameter Items to Build: cannot convert value
'Microsoft.TeamFoundation.Build.Workflow.Activities.BuildSettings' of
type Microsoft.TeamFoundation.Build.Workflow.Activities.BuildSettings
to type
Microsoft.TeamFoundation.Build.Workflow.Activities.Buildsettings,
reset to default.
It is displayed when editing the build definition and wanting to select the project/solution and configuration to build. Actually, with this now I cannot save (without error) any more and the value gets deleted again.
(I am using VS 2012 (VS 2010 still installed) against TFS 2012.)
How to fix?
Open up your XAML and look at the xmlns's on the Activity root node:
Here's a snipped version of mine:
<Activity mc:Ignorable="sads sap sap2010" <!--Removed-->
xmlns="http://schemas.microsoft.com/netfx/2009/xaml/activities"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:mt="clr-namespace:Microsoft.TeamFoundation;assembly=Microsoft.TeamFoundation.Common"
xmlns:mtbc="clr-namespace:Microsoft.TeamFoundation.Build.Client;assembly=Microsoft.TeamFoundation.Build.Client"
xmlns:mtbw="clr-namespace:Microsoft.TeamFoundation.Build.Workflow;assembly=Microsoft.TeamFoundation.Build.Workflow"
xmlns:mtbwa="clr-namespace:Microsoft.TeamFoundation.Build.Workflow.Activities;assembly=Microsoft.TeamFoundation.Build.Workflow"
xmlns:mtbwt="clr-namespace:Microsoft.TeamFoundation.Build.Workflow.Tracking;assembly=Microsoft.TeamFoundation.Build.Workflow"
xmlns:mttbb="clr-namespace:Microsoft.TeamFoundation.TestImpact.BuildIntegration.BuildActivities;assembly=Microsoft.TeamFoundation.TestImpact.BuildIntegration"
xmlns:mtvc="clr-namespace:Microsoft.TeamFoundation.VersionControl.Client;assembly=Microsoft.TeamFoundation.VersionControl.Client"
xmlns:mtvc1="clr-namespace:Microsoft.TeamFoundation.VersionControl.Common;assembly=Microsoft.TeamFoundation.VersionControl.Common"
Look for Version Specific references (usually "10.0" or "11.0") and remove them so they look like the ones I have above.
Also, check you project references and ensure that they are not Version Specific.
Here is HOW to change the assemblies in your TFS Template:
In Source Control Explorer, browse to the BuildprocessTemplates and
open (double-click or choose "View" from the Right Click menu) the
template that your build is based on (the one giving you the above
error)
You should see a visual diagram of the workflow. At the bottom are
three tabs: Variables, Arguments, and Imports. Click on Arguments.
Select the BuildSettings Argument
Find the Properties box. The properties for an arguement are:
ArgumentType, Direction,IsRequired, Name, and Value.
Microsoft.TeamFoundation.Build.Workflow.Activities.BuildSettings
should be the selected Type but the problem is (typical) you can't
tell which version of this assembly is selected. Click the drop
down.
At the bottom of the list choose "Browse for Types..."
NOW you can see all of the available assemblies and their versions. Choose the one you want, most likely upgrade to the latest. Be sure to go through all of the various arguements and make sure their types are all are set to the same version to ensure compatibility.
You may encounter issues now saving the file. All may appear to be ok. TFS indicates it knows the file has changed, checkin seems to go smoothly, but when the file is opened the assemblies still reflect v 10. If you open the same file from the file system you may find that the assemblies in the file really are v 11. What give? No idea. Some sort of glitch in VS.
But here is a work around:
Uninstall VS 2010 Team Foundation Server Power Tools from your
development machine
Open VS 2012 and make sure the template has no pending changes (undo) and get latest version
CHECK OUT FOR EDIT (important) but do not make any changes in VS (it
won't open anyway since the 10 assemblies were uninstalled in a
previous step)
Close VS 2012 (important because if it is open it will appear that your change didn't take)
Open the template from the file system (I used notepad to eliminate any interference from VS) and perform a find/replace on "Version=10.0.0.0" with "Version=11.0.0.0" and save the file
open VS 2012 and now you should be able to see the workflow designer
Of course, check in the file

Perforce: P4V option to 'add to client view'? (It exists in P4Win)

In the Perforce realm, the P4Win GUI is now "legacy" and the new P4V is supposed to fill in the void (and it does, most of the time).
There was one very useful (albeit rather hidden) option in P4Win that allowed adding a depot path to the client specification in a few clicks.
Is there a similar option available in P4V? ... because I can't find it.
(I know I can do it manually.)
Here is the P4Win feature, in all its glory:
This is typical for the P4 GUI (old and new) - it can do lots of things, if only you knew where to look (hint: usually not where you'd expect to find it).
There IS an option in P4V similar to the old 'Add Files to client view' from P4Win, only a lot more powerful! (it's a bit hidden and IMO not as streamlined as the original)
You can't find it in the depot view, where you probably ARE when you need it. Instead, go to Workspaces view, right-click the workspace definition and 'Edit' it (or dbl-click it then click 'Edit').
Notice the tabs on top of the 'Workspace editor' window that just opened. Select the 'View' tab. There is a lot going on here, including (apparently) information on the new 'Offline' mode.
To get to the point: in this window, find the piece of depot you need and right-click it.
Nirvana! There are no less than 6 menu options (!) that allow you to specify how and what to add OR remove to/from the workspace definition.
There's even an 'advanced' mode that looks a bit scary :-&
For P4V version : Rev. Perforce Visual Client/LINUX26X86_64/2012.1/490402
Released on 2012 July 02
Do as follows
Go to Connections -> Edit Current Workspace
In the Basic tab , Workspace Mappings , Right click on the tree and Include Tree.
I don't think that there is, you need to open the Workspace view and make your changes there.
Edit your workspace and change the view to include the relevant directory. Although I use P4V everyday and 'Add to client view' seems to ring a bell....
Of note, they added this feature into the P4V client at some point. You can now right click on a path in the depot tab and choose "Map to Workspace View...". It will bring up the workspace editor with the path added.

Resources