tortoisesvn

Is there a Fix for TortiseSVN Overlay Icons on Windows

十年热恋 提交于 2019-12-04 11:25:59
问题 Sometime today the TortiseSVN overlay icons disappeared on my Windows 10 PC. A quick google search shows many, many, many instances of this occuring over the past few years from Windows 7 up to recent Windows 10. By and large the suggestions fall into two groups. Various manipulations that don't work any more and manually hacking the registery with RegEdit to delete some other icons. In addition there are many examples of this issue for Tortisehg and TortiseGit. So we are on the same page,

Handle renames in parallel branches

旧街凉风 提交于 2019-12-04 10:08:16
I have a typical Subversion set-up: /trunk /branches/client-one /branches/client-two /branches/client-three Trunk holds main development and branches hold client customizations. Now and then, I port changes from trunk into branches and viceversa: [+] /trunk/readme-trunk.txt [port] /trunk/readme-trunk.txt -> /branches/client-one/readme-trunk.txt [port] /trunk/readme-trunk.txt -> /branches/client-two/readme-trunk.txt [port] /trunk/readme-trunk.txt -> /branches/client-three/readme-trunk.txt It works pretty flawlessly, except when I need to rename a file. Now matter how I do it, I always get tree

How to use SVN without a server?

让人想犯罪 __ 提交于 2019-12-04 09:59:22
问题 the idea is to use SVN (Tortoise) but, the thing is I dont have and dont want to use a server, cuz this will be used with only one person, is a college project. I have an old computer that I could use to make a server, the idea is to use it like a server. What documentation should I read, or what should I do to make it happen?... 回答1: You can access the repository using file:// protocol so you will only need Tortoise SVN installed and nothing else. See this question in FAQ: Is it possible to

How do I revert the Subversion repository, not my working copy, to a specific revision?

别来无恙 提交于 2019-12-04 09:17:34
I'm relatively new to Subversion, coming from Source Safe, and it's driving me nuts. Using the Tortoise interface, Commit kept showing me .java files in my bin directory which it said were "missing" - ok, that's a separate question. Basically, when I tried several things to get rid of the spurious "bin" message, Tortoise instead deleted my entire source directory. I tried re-adding things, but when I added, it came in as new, with no history. How do I take Subversion back to a particular revision? As if I had never happened? I know how to do this in VSS, but every time I try in TortoiseSVN, it

Tortoise SVN hidden _svn folders

一世执手 提交于 2019-12-04 09:12:04
问题 They are specially annoying when I need to upload to the server a web solution. Is there a way of configuring SVN to create the _svn folders outside my working directory? If not, what is the best way to deal with them when you need to copy only the code? Update: Using "svn export" command is problematic because there are files that are not under source control but necessary like .dll's, xml data files or database files and they will not be exported. Therefore it would be required to manually

Is there anyway to get TortoiseSVN to leave EOL (line endings) as is?

拜拜、爱过 提交于 2019-12-04 08:06:31
问题 I'm checking out files that have Linux style line endings (just LF char). When I check out a file with TortoiseSVN in Windows, it converts the line endings to Windows style (CR+LF). I've tried adding the lines to the subversion config file to force it to use LF, and yes, I did set the enable-auto-props = yes. This doesn't work, and even if it did, it's not exactly what I want, because I'd rather have TSVN simply not touch the files. Just copy them as is. 回答1: As others have pointed out, you

HG Convert on SVN gives “does not look like a Subversion Repository”

喜夏-厌秋 提交于 2019-12-04 07:46:40
I just installed TortoiseHG v2.11 with Mercurial-2.9 I am attempting to convert my local Subversion repositories created with TortoiseSVN 1.8. 4, Subversion 1.8.5 To be sure that my old Subversion repositories don't have any weird quirks I created a new SVN repo called test_repo with the default folder structure, performed a Checkout to test_repowc, then added some text files to the trunk, then modified and committed the files a few times to provide some history. I then opened cmd.exe, navigated to the folder and tried hg convert test_repo and got the following: assuming destination test_repo

Tortoise SVN Making a past revision the new Head

馋奶兔 提交于 2019-12-04 06:43:46
问题 I have reverted to a past revision in Tortoise SVN for my project. I want the past revision to be the new Head revision. How do I go about doing that? Updating after the reversion did not change the files that were reverted. 回答1: Rolling back to a previous revision is done via a reverse merge. Update your working copy to the latest revision Execute the following: svn merge URL_TO_LOCATION_IN_REPOSITORY . -r HEAD:PAST_REV_YOU_WANT Commit 来源: https://stackoverflow.com/questions/41625626

git hash to svn number generation scheme

生来就可爱ヽ(ⅴ<●) 提交于 2019-12-04 06:14:55
问题 Recently I have find out that TortoiseSVN (surprise, surprise) supports git. So you can just checkout git repository using TortoiseSVN, and even to reference external git repositories. On internet there exists huge amount of questions & threads on how to get good numbering scheme from git hash, which is found many times as too cryptic and difficult to use. For example: How to get the git commit count?. By following this link: Is there a git-svn windows client something like TortoiseSVN?, I

使用TortoiseSVN进行分支管理

半腔热情 提交于 2019-12-04 06:12:00
SVN中的Branch/tag在一个功能选项中,在使用中很容易产生混淆。 分支(Branch)管理和标记(Tag)管理,版本管理系统有两个基本的功能。 分支用于在并行开发,这里的并行是指和trunk(主分支)的并行。 而tag是用来做一个里程碑(milestone),不管是不是release,都是一个可用的版本。 那么什么时候用到tag管理?什么时候用到Branch管理? 我举两个场景: 场景一,有客户想对产品做定制,但是我们并不想修改原有的svn中trunk的代码。 场景二,我们正在开发产品下阶段的任务,但上阶段的工作发现问题 以场景二为例,项目某一阶段开发完成后,这个时候要做一个tag,tag_mfcai_V1.01.00, 然后基于这个tag发布一个新的版本,假设项目是web项目,那么基于这个tag发布一个war包。 然后trunk进入下阶段继续开发,但是很不幸发布的版本被检测出来了bug,有人会提议,把bug放到下阶段的任务中去。假设下阶段的任务才刚开始,用户可等不起.他们会认为一个小的bug解决要这么长时间,效率太低了. 那么就需要基于tag_mfcai_V1.01.00做一个branch,branch_bugfix_V1.01.00,基于这个branch进行bugfix, 等到bugfix结束,做一个tag,tag名称假设为:tag_mfcai_V1.01.01