I have been using git-svn working happily along, branching for whatever, rebasing from and dcommitting to trunk and then the powers that be decided that we are going to start working out of a branch instead of trunk. My question is how do I get branches that were spawned from master that was tracking trunk to rebase/merge into the new lo...
I am having some difficulty accessing my svn repository. Cannot browse the repository, do updates and/or commits, basically nothing can be done. I get "can't open file /format permission denied" error. Other users are able to perform all operations normally. Is there a way some logging can be enabled to figure out what exactly has gone ...
So I recently had a tree conflict when trying to merge a branch into the trunk. This cascaded into a series of events in which I scrambled to try and fix the issue, but now just can't really do anything (things won't commit, things won't update, etc.) How can I just say, okay -- go back to here and start fresh, or what other techniques ...
Assuming the Hudson job checks out 2 SVN directories: https://foo.com/packages (root is https://foo.com/packages) -> "packages" in workspace https://bar.com/temp/Hudson (root is https://bar.com/temp) -> "Hudson" in workspace I tried different things, browsed online for answers, but I still can't get these 2 things to work: 1) Prevent...
What is the best way to save MySQL stored procedures and table structures in SVN? I have around 100 tables and 200 stored procedures, dumping all procedures in a single file makes no sense as it contains thousands of lines and hard to maintain. I'm now thinking of creating separate separate files for each table and procedure, but it wi...
Hello CentOS release 5.5 (Final) svn, version 1.4.2 (r22196) Apache httpd.i386 2.2.3-43.el5.centos.3 I have a file called subversion.conf in the /etc/httpd/conf.d/subversion.conf LoadModule dav_svn_module modules/mod_dav_svn.so LoadModule authz_svn_module modules/mod_authz_svn.so # Virtual path for websvn Alias /wsvn /var/ww...
Hi I have a framework based project that I'm using SVN to version control. I have a local working copy I use for development, a working copy on the staging machine that's checked out the latest RC tag, and the latest stable tag checked out on my production server. When I'm promoting a tag to live, I simply "switch" the working copy on ...
I have an SVN server, and I'd like to use our LDAP server for user authentication. Right now I'm specifying usernames and passwords per repository, which is working OK, but more people are deciding to use this server. And I really shouldn't have access to their passwords. I'd like to use LDAP to authenticate users, and I want to grant ac...
I really like being able to the command-line tool gitx from Terminal.app to open GitX and see the Git repository change log that I can scroll through, with nicely formatted diffs for each. Git and Subversion are fairly different, and I know a tool to view a log and diffs for a checkout of a part of the subversion repo certainly wouldn't...
Using Subversion (TortoiseSVN/CollabNet Edge); building an .msi (Visual Studio Installer project type) wipes out the .svn files in the directory and creates subversion conflicts. TortoiseSVN won't allow the Resolve command. How to resolve the conflicts? ...
I have a multi-step deployment system setup, where I develop locally, have a staging app with a copy of the production db, and then the production app. I use SVN for version control. When deploying my production app I have been just moving the urls.py and settings.py files up a directory, deleting my django app directory with rm -rf com...
I'm trying to merge multiple Subversion repositories into a single repository without too much hassle on my users. I did roughly the following: > svnadmin dump old_repo > old_repo.dump > svnadmin load combined_repo --parent-dir old_repo_path < old_repo.dir > cd old_working_dir > svn switch http://server/combined_repo_root/old_repo_path...
I have a problem when I rename the checked out working file from Tortorise under subversion. After rename the local file, my local file got lost. I want to know how I can get my local copy back, either from Tortorise or other? ...
Hello everyone, I'm using git for quite some time now, mainly git-svn. Now I want to convince my colleagues to switch from svn to git. But unfortunaly the precondition is that the svn repository keeps on living quite a time. So I searched for an solution an came up with the book: Jon Loeliger's "Version Control with Git" I bought it and...
I have an SVN repository hosted on a freemium site with a maximum repository size. As I approach this capacity I am aware of files I've checked in that I know I can remove permanently to free up disk space. How do I tell SVN that a file can not only be deleted, but it's history as well? ...
Hello, CentOS 5.5 Subversion 1.4 httpd-2.2.3-43.el5.centos.3 I am trying to create multiple directories for each project under a project category. For example, we have projects for web, dev, test, etc So all web projects will have their own repositories and the same for dev, and test. My structure is this: /var/www/svn/repos/WEB/w...
Hello, CentOS 5.5 Subversion 1.4 httpd-2.2.3-43.el5.centos.3 I have the following repository structure I am created multiple directories for each project under a project category. For example, we have projects for WEB and DEV So all WEB projects will have their own repositories and the same for DEV. My structure is this: /var/www/s...
We recently moved our project from Google Code to GitHub, but only wanted to move a part of it (up to say revision 600) so instead of using GitHub's built-in system to transfer an SVN repo over we just created the project out of a local project folder that was appropriate. However, I'd like to transfer over the revision history up to a ...
I'm working on a small, personal project and am using Subversion to manage the source code. I have a couple of small planning files - simple text documents explaining where I want to go with the project and some ideas worth keeping track of about what I've already done - that I think should be under source control as well. What I don't ...
This seems like a simple problem, but I can't figure out how to edit the svn-ignore list from Eclipse. Strangely I couldn't find how to do so on a web search or on stackoverflow. Thanks! ...