tortoisesvn – Page 7

Tortoisesvn Subversion 1.8 – merge – no more reintegrate a branch option

March 7, 2023 by Tarik

It is no longer in TortoiseSVN because Subversion 1.8 deprecated the –reintegrate option. Subversion 1.8 has automatic reintegration handling/detection. See: Subversion 1.8 release notes, specifically the auto-reintegrate section Here is the relevant area, for convenience: Automatic reintegration merge (–reintegrate option deprecated) During merges which merge all eligible revisions from another branch, Subversion 1.8 will automatically … Read more

Very slow (tortoise)SVN compare to base since win 10 Fall Creators Update [Local Repo]?

March 3, 2023 by Tarik

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 … Read more

How to integrate WinMerge with TortoiseSvn after installation?

March 2, 2023 by Tarik

You can open the TortoiseSVN settings and manually enter it: My command line from the screenshot above is: C:\Program Files (x86)\WinMerge\WinMergeU.exe -e -x -ub -dl %bname -dr %yname %base %mine If you install TortoiseSVN after WinMerge, probably the easiest way would be to uninstall and re-install WinMerge again.

An SVN error (200 OK) when checking out from my online repository

February 26, 2023 by Tarik

I had to dig into this issue too and found the following pages which lead me to the solution: – http://comments.gmane.org/gmane.comp.version-control.subversion.devel/117844 (See especially the link to “Julian’s patch”.) There is stated that the “OPTIONS of <url>: 200 (<url>) OK” error is quite misleading and often just means that the repository URL is wrong.

Working Copy Locked

February 25, 2023 by Tarik

Every time I get a Working copy locked error I run a “Clean up”. After that everything is back to normal. On the command line you can execute svn cleanup which also removes lock files. Note: Perform this operation on one level up directory and that should resolve most of the times.

Is there a way to turn TortoiseSVN using svn:mergeinfo off?

February 24, 2023 by Tarik

That is happening, very likely, because those files and directories have the svn:mergeinfo property set from a previous merge. I don’t think it’s generally a good idea to merge individual files or directories in a way that causes the mergeinfo to be written to individual files. You should get into the habit of merging at … Read more

Windows Explorer icons in TortoiseSVN take a long time to refresh to correct state

February 24, 2023 by Tarik

As stated in the FAQ: try running a cleanup.

SVN – Reintegration Merge error: “must be ancestrally related”

February 20, 2023 by Tarik

I just went through a similar problem, wanted to add the issue and solution I hit. The branch was made from a SUBFOLDER of trunk and not the entire tree. Thus, when I tried to reintegrate, I was mismatching hierarchies. Simply restructuring the integrate to be to the proper subfolder of my trunk WD allowed … Read more

What Visual Studio files should be ignored by subversion to minimize conflicts?

February 19, 2023 by Tarik

bin and obj directories *.user files (MyProject.csproj.user) *.suo files Also, if you are using Visual Studio 2015 the .vs directory.

Tortoise SVN: Resolve conflict using ‘theirs’. What does it mean?

February 13, 2023 by Tarik

Resolve conflict using ‘theirs’ means that when you try to check in two files that have conflicting edits, SVN will discard your changes and use the other persons change instead. Resolve conflict using ‘mine’ means that you will discard their changes, and use your version of the file instead.