tortoisesvn

Compare files between two branches in TortoiseSVN

允我心安 提交于 2019-12-20 08:31:56
问题 I know how to do this in SVN, svn diff http://svn.example.com/branches/A/File1.txt http://svn.example.com/branches/B/File1.txt But there has to be a less painful way to do this in TortoiseSVN. You would think that you could do it from the Show Log, but it appears to only show revisions on the current branch. 回答1: Go to the repository browser (<right click>/TortoiseSVN/Repo-browser/<enter URL>). Open right click menu on branch B, select 'Mark for comparison'. Then open right click menu on

Folder is locked and I can't unlock it

落花浮王杯 提交于 2019-12-20 08:15:29
问题 When I'm trying to update or commit code from a project it's telling me that the folder is locked. When I try to "release lock" it says that there's nothing to unlock in this working space. What does that mean? Why I can't update, commit or even clean up the project. 回答1: Right click on your Subversion working directory folder, and select TortoiseSVN->Clean Up from the Context Menu. This will recurse it's way through your working directory and cleanup any incomplete actions, remove the local

svn: How to revert somebody else's commit?

半世苍凉 提交于 2019-12-20 07:13:58
问题 Argh, somebody (OK, my boss) added and commited all the files in his directory, meaning all the svn files: conf/, db/, format, hooks/, locks/... I'm using Tortoise, so I tried clicking on each one and doing revert, it said OK, but I still see all of them under version control after update/commit. We are now several versions past that. How do I clean things up ? Thanks 回答1: In Subversion, "revert" means to undo uncommitted changes to a working copy. What you're looking to do is to (effectively

SVN: Way to determine revision by comparing file or file content

旧巷老猫 提交于 2019-12-20 04:50:33
问题 I have a scenario where I have a file and I need to know what revision in source this file is. I may have hundreds of revisions on a particular file and have a file that matches one or more of those revisions. Is there any way in Tortoise, Cornerstone or through the command line to do this? Apologies if the question isn't the clearest. To be honest I'm not sure how to phrase what I'm looking for. I found a similar question about git here; GIT: determine revision based on a file 回答1: Cribbing

Why doesn't Subversion allow to commit .htaccess files?

孤街醉人 提交于 2019-12-20 02:29:26
问题 I can't commit .htaccess files from my Windows SVN client (TortoiseSVN). The error that is returned is: Could not read status line: Existing connection was forcibly closed by the remote host. And here is basically what my vhost looks like in Apache: <VirtualHost *:80> DocumentRoot /var/www/mydomain.com/legacy/trunk/html ServerName mydomain.com <Directory /var/www/> FileETag MTime Size AllowOverride All </Directory> <Directory /var/www/tools> AllowOverride All </Directory> <Location /svn> DAV

Changing working folder location

时间秒杀一切 提交于 2019-12-20 01:08:24
问题 I want to change the location of working folder. How to make the changes in my SVN repository? I am using TortoiseSVN client. 回答1: If you want to move your entire working copy, just move it in the file system. If you want to move a folder within the working copy and later commit the move, right click on the folder, pick TortoiseSVN->Rename. Change YourFolder to something like ..\..\NewFolder\AnotherFolder\YourFolder . Note that ..\..\NewFolder\AnotherFolder\ must exist before the operation.

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

≡放荡痞女 提交于 2019-12-19 12:51:31
问题 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

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

那年仲夏 提交于 2019-12-19 12:50:55
问题 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

TortiseSVN svn+ssh Error: Unable to connect to a repository at URL … Network connection closed unexpectedly

 ̄綄美尐妖づ 提交于 2019-12-19 07:26:07
问题 I'm having problems accessing an SVN repository using TortoiseSVN 1.7.8. The SVN repository is on a CentOS 6.3 box with openssh 5.3p1:81.el6 and appears to be functioning correctly. # svnadmin --version # svnadmin, version 1.6.11 (r934486) I can access the repository from another CentOS box with this command: svn list svn+ssh://USER@xxx.xx.xx.xxx/var/svn/joetest But when I attempt to browse the repository using TortiseSVN from a Win 7 workstation I'm unable to do so using the following path:

Manage config file differences between development and production servers with SVN

﹥>﹥吖頭↗ 提交于 2019-12-19 03:32:10
问题 I have a few files of a .NET app that are different in the production server from the development server. For example: Web.config MasterPage.master account/account.aspx blog/Web.config and a few more... What is the best way to manage these differences with SVN? I've heard everything from maintaining a config folder in the trunk to creating a branch with the "different" files, then merging them into the release tag. I use SVN trunk for main development (stable) and tag the trunk when it's