tortoisesvn

TortoiseSVN write-lock error?

假装没事ソ 提交于 2019-12-01 16:41:08
Wanted to merge my branch back into the main trunk today. Haven't worked on this project for a week and haven't done any commits, etc. in that time-frame. Attempted to do a switch from the branch back to the trunk and get this error: No write-lock in 'Y:\Website\_Working Copy\app' I've never had or seen this issue in the past and can't find any documentation on what is going wrong...what could this be and what can I try? Also, I just upgraded TortoiseSVN & SVN to latest versions to see if that would repair a damaged file but no-go. Hmm... That is odd, but it's a problem in your working copy. I

It is possible to completely remove a file from my SVN repository?

陌路散爱 提交于 2019-12-01 15:12:20
I am using tortoise SVN for a project that I'm working alone and I have committed (by mistake) a huge file to my repository (a VC++ Intellisense Database). Now I want to remove this file from my repository to facilitate its backup. Removing the file from my project and doing a commit (obviously) do not solve my problem as the previous version of that file are still there in the repository. Is there a way to solve this problem that does not involve the creation of a new repository? EDIT The @ryansstack solution worked perfectly, that is what I did (I ran the commands in the directory where my

Source Insight技巧收集

前提是你 提交于 2019-12-01 14:53:29
Source Insight技巧收集 (2008-11-11 05:56) 1、背景色选择 要改变背景色Options->preference->windows background->color设置背景色 2、解决字符等宽对齐问题。 SIS默认字体是VERDANA,很漂亮。这网页上应该也是用的VERDANA字体。但由于美观的缘故,VERDANA字体是不等宽的。比如下面两行 llllllllll MMMMMMMMMM 同样10个字符,长度差多了.用VERDANA来看程序,有些本应该对齐的就歪了。解放方法是使用等宽的字体,但肯定比较丑。比较推荐的是用Courier New。 3、解决TAB键缩进问题 Options-> Document Options里面的右下角Editing Options栏里,把Expand tabs勾起来,然后确定。OK,现在TAB键的缩进和四个空格的缩进在SIS里面看起来就对齐咯 4、SI中的自动对齐设置: 在C程序里, 如果遇到行末没有分号的语句,如IF, WHILE, SWITCH等, 写到该行末按回车,则新行自动相对上一行缩进两列。 Option->Document option下的Auto Indient中Auto Indient Type有三种类型 None,Simple,Smart。个人推荐选用Simple类型。 5、向项目中添加文件时

SVN使用总结

僤鯓⒐⒋嵵緔 提交于 2019-12-01 12:02:09
我使用的是TortoiseSVN,先安装好。 1、本地Repository的创建 repository的创建很简单,假设我要在D:\TortoiseSVN\TestRepository目录中创建repository,只需右键TestRepository目录,依次选择"TortoiseSVN" -> "Create repository here"便完成了repository的创建。 2、Check out 假设要check out到D:\TortoiseSVN\TestSVN,同样很简单,在D:\TortoiseSVN目录下创建TestSVN目录,然后在该目录上右键,选择"SVN Check out...",在弹出的窗口中的"URL of repository"中填入"file:///D:/TortoiseSVN/TestRepository",其他默认即可,最后点击ok。 3、trunk创建新项目MyProject 相当简单就不赘述了,只列出本次操作所作出的修改: 4、创建branch 在/trunk/MyProject目录上右键,依次选择"TortoiseSVN" -> "Branch/tag...",在弹出窗口的"To URL"中填入分支的地址,在这里目标revision选择HEAD revision,如下图所示,添加log后点击ok分支便建立了。这个操作速度非常快

SVN commit doesn't complete

前提是你 提交于 2019-12-01 09:31:20
问题 When I commit files in svn I often get the situation where after it has transmitted all the files svn will hang and then eventually time out with the error svn: E175012: Connection timed out . This seems to happen when I am uploading more than say 20 files. I believe this is happening after all of the files have been transferred to the server as either new periods will have stopped being added after Transmitting file data in the console, or all of the files have been listed as sent in

源代码管理工具(2)——SVN(2)——第一次用SVN遇到的问题

若如初见. 提交于 2019-12-01 08:22:09
今天因为项目的需要第一次使用了svn来托管项目,第一使用svn遇到了几个问题。 这个安装的过程很简单,不再赘述。在安装完成之后,相信肯定有一部分第一次用这个的人直接到开始处打开这个软件,这时候就会弹出下面的提示: TortoiseSVN is a shell extension. That means it is integrated into the windows explorer. To use TortoiseSVNplease open the explorer and right-click on any folder you like to bring up the context menu where you will find all TortoiseSVN commands. And read the manual! ​ 这个是什么原因呢?原来svn并不是直接这样打开的,而是选择一个文件夹,然后右键,选择 SVN Checkout ,如下: ​ 然后问题就来了,在有的电脑上面右键之后并没有出现相关的选项,那该怎么办呢?解决方案如下: 进入:开始–>程序–>TortoiseSVN–>Setting–>Icon Set选择Mufwin7。 ​ win + R ,输入“regedit”进入注册表; 选择目录:HKEY_CLASSES_ROOT/*/shellex

Tortoise SVN - Merge Trunk into Branch - Tree Conflict

时光总嘲笑我的痴心妄想 提交于 2019-12-01 07:19:26
问题 We are on SVN 1.8 and I'm using Tortoise SVN 1.8 as well. The main code resides on /project/trunk. I will be doing a large change so I created a branch in /project/branches/x that was a copy of /project/trunk . As part of the change, I need to rearrange the directory structure to handle multiple clients. Currently the the trunk looks like: /project/trunk/process/xyz/file1.xml /project/trunk/process/xyz/file2.xml I want to change the structure to be more like: /project/trunk/process/xyz

Import on TortoiseSVN?

筅森魡賤 提交于 2019-12-01 04:17:47
I am trying to set up TortoiseSVN . I am using the Windows version and using the context menu, you right click and it has some options. For initially getting my files into to a repository I try to do import and it is the only thing that makes it seem like it is working, and it shows in the log. Adding filepath But eventually when it gets to the jQuery file that's in my directory I get an error and everything comes to a stop. How can I get around this? Export is not what you think it is. It's used to get the files that are already in the repository without the extra versioning data. For my

How to use custom keywords in SVN

孤街浪徒 提交于 2019-12-01 04:17:33
I'm using a VisualSVN server and TortoiseSVN client. I have set the properties svn:keywords = Author Id Revision LastChangedDate Copyright copyright = (c) 2009 Foo Company. Then, when I try to use these properties in the header file (including the custom property Copyright), I do it like: /****************************************************************************** * $Id$ * * $Author$ * * $Revision$ * * $LastChangedDate$ * * $Copyright$ ******************************************************************************/ Every property is getting substituted right, except for the Copyright. What

Import on TortoiseSVN?

送分小仙女□ 提交于 2019-12-01 02:00:24
问题 I am trying to set up TortoiseSVN. I am using the Windows version and using the context menu, you right click and it has some options. For initially getting my files into to a repository I try to do import and it is the only thing that makes it seem like it is working, and it shows in the log. Adding filepath But eventually when it gets to the jQuery file that's in my directory I get an error and everything comes to a stop. How can I get around this? 回答1: Export is not what you think it is.