tortoisesvn | 易学教程

Can't open .svn/text-base/file.svn-base?

阅读更多关于 Can't open .svn/text-base/file.svn-base?

问题 I'm using TortoiseSVN. I just made quite a few changes to my working copy and now I went to do a commit some of the files went through but at one file named Search.aspx.cs it says Commit failed (details follow): Can't open file 'C:\-----\trunk\.svn\text-base\Search.aspx.cs.svn-base': The system cannot find the file specified. I have tried doing a SVN update and SVN cleanup and nothing is restoring this file. I can't even create a diff because it gives a similar error about missing files. How

Error “can't use subversion command line client : svn” when opening android project checked out from svn

阅读更多关于 Error “can't use subversion command line client : svn” when opening android project checked out from svn

I'm new to Android development and the development tools around it. I have checked out a project from svn using TortoiseSVN client (can't manage to do it from within Android Studio), then get this error message after importing the project to Android Studio: can't use subversion command line client : svn Probably the path to Subversion executable is wrong. Fix it.. When I click "Fix it" link, this dialog pops up: But I still have no idea what I am supposed to do to fix this? Any kind of help/suggestion/direction to fix the problem are welcome. janos Android Studio cannot find the svn command

What is the correct way to restore a deleted file from SVN?

阅读更多关于 What is the correct way to restore a deleted file from SVN?

I deleted a file from a repo and now want to put it back. The best I can figure out is to: update to the revision before the delete copy the files elsewhere update to head copy the files back add them commit That just smells bad and it looses all history to boot. There has got to be a better way to do this. I have already looked in The SVN Book but didn't find anything and am now looking down the SVN tag list. Sean Bright Use svn merge: svn merge -c -[rev num that deleted the file] http://<path to repository> So an example: svn merge -c -12345 https://svn.mysite.com/svn/repo/project/trunk ^

Is there a git-svn windows client something like TortoiseSVN?

阅读更多关于 Is there a git-svn windows client something like TortoiseSVN?

问题 I like TortoiseSVN's Windows integration. Is there something like that for dealing with git-svn? I'd even go with a less integrated GUI if it is quick enough to access. What I don't want is a CLI as I rarely would have a command prompt sitting in the correct directory. This is a related question but for Linux 回答1: Have a look at TortoiseGit which is a TortoiseSVN clone for Git. 回答2: TortoiseGit (https://tortoisegit.org/) added basic support for git-svn in release 0.8.1.0: The release log says

SVN move single directory into other repository (with history)

阅读更多关于 SVN move single directory into other repository (with history)

问题 Related question: Moving repository trunk to another’s branch (with history) I know that one can dump a complete SVN repository with history and load it into a user-defined (sub)directory of the target repository using: // in source repo > svnadmin dump . > mydumpfilename // in destination repo (backslashes because I'm using Windows) > svnadmin load . < mydumpfilename --parent-dir some\sub\directory But this will import the full repository into the target repository's sub-directory. What I

How do you branch and merge with TortoiseSVN? [closed]

阅读更多关于 How do you branch and merge with TortoiseSVN? [closed]

How do you branch and merge with Apache Subversion using the TortoiseSVN client? JoelFan My easy click-by-click instructions ( specific to TortoiseSVN ) are in Stack Overflow question What is the simplest way to do branching and merging using TortoiseSVN? . Version Control with Subversion A very good resource for source control in general. Not really TortoiseSVN specific, though. Black Horus You can also try Version Control for the Standalone Programmer - Part 1 or perhaps Merging with TortoiseSVN . 来源： https://stackoverflow.com/questions/90/how-do-you-branch-and-merge-with-tortoisesvn

Resolving tree conflict

阅读更多关于 Resolving tree conflict

问题 How to resolve tree conflict in current scenerio. C:\DevBranch C:\MyBranch I updated both branches. Edited MyBranch and then committed back. Now want to merge those changes into DevBranch. When I am doing the merge I am getting 'Tree Conflicts' The last merge operation tried to add the file 'abc.def', but it was already added locally. How do you want to resolve this conflict? Keep the file from repository Keep the local file How can I resolve? 回答1: What you can do to resolve your conflict is

TortoiseSVN icons overlay not showing after updating to Windows 10

阅读更多关于 TortoiseSVN icons overlay not showing after updating to Windows 10

问题 I had been using Windows 8 and TortoiseSVN icons have been displaying properly, but after installing Windows 10 I can no longer see the icons for the files/folder status. 回答1: Had same issue, and was solved by running regedit , erasing some entries in HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\explorer\ShellIconOverlayIdentifiers and restarting. Deleting OneDrive1... enties was not permited, but I had some from Google Drive. You can also make a bakup by double-clicking in

Subversion stuck due to “previous operation has not finished”?

阅读更多关于 Subversion stuck due to “previous operation has not finished”?

问题 If I try to update my subversion repo, it says I must run cleanup. If I run cleanup, it says a file is missing. (I deleted a MASSIVE directory of files that failed to commit this morning from my home pc, but then I commit the same set of files from work, and now my home repo is bust). So, cleanup says: Cleanup failed to process blablabla Can't set file blablabla read-write: The system cannot find the file specified. If I update it says: Command: Update Error: Previous operation has not

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

阅读更多关于 An SVN error (200 OK) when checking out from my online repository

I'm trying to set up my first repository on my host and am getting this error when I use TortoiseSVN to checkout the project: Error: OPTIONS of ' http://mywebsite.com/svn/myproject ': 200 OK ( http://mywebsite.com ) Here is what I did: Ssh into my host and head to /home/myaccnt and 'svnadmin create svn' Create my project repository: 'svn mkdir svn/myproject' Add files to the repository: cd /home/myaccnt/.../myproject (which has /tags, /branch, /trunk); 'svn import file:///home/myaccnt/svn/myproject' (the big old list of files being added is seen at this point.) At this point I think that I've