tortoisesvn

问题 I have a project in the 'trunk' folder. When I needed to create a branch, I copied the contents of the 'trunk' folder into a new 'branch' folder. As a result, the directory structure looks like this. Now I want to merge the contents of the branch and the trunk into the trunk folder. How can I achieve that? I tried by selecting ' Merge two different trees ' from the Merge menu of tortoise SVN. I entered the trunk URL in the FROM field and the branch URL in the TO field. However, it gives the

问题 I have installed Subversion 1.8.8 and TortoiseSVN 1.8.5 64-bit on Windows 7 64-bit. I have created a local repository at C:/Projects/SVNRepository using TortoiseSVN. While trying to import project from NetBeans i am getting this error. org.apache.subversion.javahl.ClientException: E180001: Unable to open an ra_local session to URL E180001: Unable to open repository 'file:///C:/Projects/SVNRepository' E160043: Expected FS format between '1' and '5'; found format '6' 回答1: First: Never use the

问题 This question already has answers here : SVN (Subversion) Problem “File is scheduled for addition, but is missing” - Using Versions (6 answers) Closed 6 years ago . I created a conflict by deleting a folder while committing a change to my repository, and now there's a red exclamation point over the folder that won't go away. I've tried committing the folder again, but I get an error: Commit failed (details follow): 'W:\LDraw\datsville\svn\trunk\povray\New folder' is scheduled for addition,

问题 A client of mine has trouble with TortoiseSVN. It was working fine till now. She did her last commit on Thursday Feb. 23. 2013 But now she gets the following error: OPTIONS SSL handshake failed: SSL error: sslv3 alert illegal parameter She cannot access the Repository anymore. No update, no checkout, no log, etc. It is difficult to locate the problem. It shows up with tsvn 1.7.4 and 1.7.11 She cannot use tsvn with the ProjectRepository She cannot use svn commandline client (http://www.sliksvn

问题 In brief Given a setup where SVN+SSH checkout over VPN is not working, and another where it is working, what is the correct procedure to find out what is the difference between two systems? Details I am using a 64-bit system running Windows 7. I have Open VPN and Tortoise SVN 64-bit installed. The repository is in a remote system, and we connect using VPN. Continuing from my earlier question SVN+SSH checkout over VPN using tortoise SVN, Smartsvn failing One new teammate (working on exactly a

问题 At work we've got a very large project (approx. 30,000 files) managed by a Borland StarTeam source control system. We'd like to migrate to SVN, but there are a few hurdles in the way. The most significant one is the problem of getting the repository set up on all the devs' VMs. There are two basic ways to set up a new SVN-versioned folder on your hard drive. (On Windows, using TortoiseSVN.) You can either check out an SVN project from a repository, or take existing code and upload it to a

问题 I know this is the same title as other posts, but I have searched and searched and cannot find a solution. I upgraded from TortoiseSVN 1.6 to 1.8.4 on all of my machines. My main dev machine started getting this error: ra_serf: An error occurred during SSL communication My client is using ProjectLocker.com, so I cannot check server logs. From what I can tell from other posts on various sites, the issue is caused by a problem with either the network stack or SSL. I have uninstalled and

问题 I'm trying to create and follow best practices for versioning control and came across a reference to atomic commits in Subversion. Since I've never heard of this action, I have a few questions about it. What's its purpose? When should it be used? How is it different than a normal commit? Is it available to TortoiseSVN users? If so, how? 回答1: There is no special command for atomic commits. Every commit in Subversion is atomic. It means every commit (of any number of files) will either succeed

问题 We currently face a strange problem on one desk that TortoiseSVN allows ot open "Show log", but closes that without any action by the user. To help solving that question, I would like to "Debug" TortoiseSVN. Is there an easy way to debug TortoiseSVN? Here are some of the requirements: Allow to write a debug log file Control where that file is written If possible, tailor what should be written 回答1: Enable the debug output via the settings dialog: Settings dialog -> Advanced ->

问题 The mergeinfo feature of SVN is really useful, but it puts a log entry in the revision log when all that's been changed on a file are svn properties, which we typically don't want to see. Is there a way to filter out property-only changes in the TortoiseSVN log? 回答1: Pull up the log Select the two revisions you want to compare Right-click and select “Compare revisions” Anything with an entry of “Normal” in the “Action” column had property-only changes. You can sort on this column and