svn

Problem trying to relocate WC to new repository

风格不统一 提交于 2019-12-22 03:59:36
问题 I have several working copies that were checked out of old repositories. The old repositories are now combined into a new repository, therefore the repository name and the locations inside the new repository have changed. Now I want to relocate these working copies to their new locations into the new repository. When doing a Relocate with TortoiseSVN, I get a warning: It seems you are trying to relocate your working copy to a different path inside the same repository. From: https://old

Detecting branch reintegration or merge in pre-commit script

冷暖自知 提交于 2019-12-22 03:49:20
问题 Within a pre-commit script, is it possible (and if so, how) to identify commits stemming from an svn merge ? svnlook changed ... shows files that have changed, but does not differentiate between merges and manual edits. Ideally, I would also like to differentiate between a standard merge and a merge --reintegrate . Background: I'm exploring the possibility of using pre-commit hooks to enforce SVN usage policies for our project. One of the policies state that some directories (such as /trunk )

How can you indicate files to ignore in svn when using git and the git-svn bridge?

浪子不回头ぞ 提交于 2019-12-22 03:47:07
问题 There is a master subversion repository that I've cloned a git repo from. I've got a lot of ignored files in my .gitignore that I'd like the svn repository to know about. I know that I can use git svn show-ignore to pull the ignored list from subversion, but how can I do the reverse? Send a list of files to be ignored back to the svn repo? Git version (and git-svn is at the same version): git --version git version 1.7.0.5 回答1: Ok, so one (annoying) method that I've found is to: (convenience

Capistrano Deploy Wipes Database?

試著忘記壹切 提交于 2019-12-22 03:33:15
问题 I've managed to deploy my app to production using Capistrano, but I don't understand how to deal with my database. I'm using subversion and passenger. When I run cap deploy, the new deployment starts everything fresh. It wipes out the data that was added to the database. Obviously, there must be a solution, but I'm very surprised not to find anything online about how to deal with this. I've read the Capistrano documentation and many tutorials. The best I can find is the Advanced Rails recipes

Subversion resolve all conflicts quickly

ε祈祈猫儿з 提交于 2019-12-22 01:53:49
问题 When I have several conflicts, is there a way to resolve them all by just telling SVN to keep the version that is in the repository? Unfortunately, we're still using 1.4. 回答1: I believe if you run the command svn revert . -R , you basically undo all changes to your working copy. If there are conflicted files, SVN tosses out your changes and uses the revision you've most recently updated to. Of course, this also gets rid of changes to files that aren't conflicted. 回答2: svn update . --accept

Force svn:eol-style=native on the server?

ε祈祈猫儿з 提交于 2019-12-22 01:51:49
问题 Currently, in order to ensure the subversion property eol-style is set to native for each new file added to our project, we have to add this to the ~/.subversion/config file on each of our developers machines: [miscellany] enable-auto-props = yes [auto-props] *.java = svn:eol-style=native Is there a way to do the equivalent on the svn server? 回答1: No there is not. You can use a hook scripts to look for the property to be set or not, but apart from that it's not possible. Subversion,

SVN: What does the status “switched relative to its parent” mean?

时间秒杀一切 提交于 2019-12-22 01:37:37
问题 I'm trying to update our live site from the SVN repository. As far as I know, there's nothing in the repos. itself that should conflict with anything in the working copy dir. But when I try to "svn up" on the public root directory, I get the following error: svn: REPORT request failed on '/svn/oursite/!svn/vcc/default' svn: Working copy path 'app' does not exist in repository When I run "svn status" on the docroot, I see the following: docroot$ svn st -N +S app +S downloads +S index.php (etc.

What is the maximum revision number supported by SVN?

余生颓废 提交于 2019-12-22 01:33:36
问题 What is the maximum revision number supported by SVN? The repo is of type FSFS, hosted on a Fedora box. Thank you, 回答1: If you're using a 32-bit computer it's 2147483647, that's 2 31 -1, the maximum value of a signed 32-bit integer. For a 64-bit computer, it's... more. In any case, it should be enough for any practical purpose where humans are doing commits. In practice, you're probably going to run out of disk space or your directory indexes become too slow before you hit the maximum

Recipe for making Cocoa NSDocument packages play well with svn?

本秂侑毒 提交于 2019-12-22 01:13:14
问题 I have a tool that writes package-style documents. It's implemented using NSDocument and overrides the following NSDocument methods: - (NSFileWrapper *)fileWrapperOfType:(NSString *)typeName error:(NSError **)outError; - (BOOL)readFromFileWrapper:(NSFileWrapper *)fileWrapper ofType:(NSString *)typeName error:(NSError **)outError; This is all lovely, except when I save a document that's under version control. (The .svn directories aren't preserved, etc.) Is there a good recipe somewhere for

Migrate SVN to HG, splitting it into subrepos in the way (but keeping combined log)

十年热恋 提交于 2019-12-21 23:32:21
问题 I have an SVN repository which contains a number of loosely-related subfolders in its trunk. I would like to convert it into HG repository, turning each of these subfolders into a separate HG subrepo. At the same time, I would like to access combined change log of all subrepos in the top level repo. So I created an empty HG repo, some empty subrepos, linked their names and locations by .hgsub , checked that I can clone this repo together wth its subrepos to another comp ... Then I tried to