I am working on an embedded project that will be using Linux and we are trying to figure out the best practice method to source control the Linux version. We want to maintain local configure files and various changes but also allow us to update the kernel if we need to. Does it make sense to make it a "vendor" branch in Subversion? I ...
A group of developers that I am working with switched from VSS to SVN about half a year ago. The transition from CheckOut-CheckIn to Update-Commit has been hard on a number of users. Now that they are no longer forced to check in their files when they are done (or more accurately, now that no one else can see that they have the file chec...
I can't svn up or commit. :( There is a svn centrally and I use git locally using git-svn. Basically, somehow, I added a folder that had .svn folders into the git and committed it to svn. Both git and central svn happily committed the .svn as the content folder, without complaining. Now, I can't svn up to the existing folder as, once ...
I often use the find command to search through source code, delete files, whatever. Annoyingly, because Subversion stores duplicates of each file in its .svn/text-base/ directories my simple searches end up getting lots of duplicate results. For example, I want to recursively search for uint in multiple messages.h and messages.cpp files:...
I need to cut a release of our software based on the latest revision of our svn repository. But there is a set of changes that we don't want - 20 or so files that were edited a month ago and then committed all at once. I made a branch called 4.3.x from the trunk, containing all the changes we want and the 20 or so that we don't want. No...
How do I use SharpSVN to programatically to add a folder to the ignore list? EDIT: Attempted: Here's what I've tried svnClient.GetProperty(new SvnUriTarget("svn://svn.foo.com/" + DatabaseName + "/"), SvnPropertyNames.SvnIgnore, out ignores); ignores += " Artifacts"; var args = new SvnSetPropertyArgs() { BaseRevision = ???, LogMessage =...
I want to copy the exact data/files from /trunk to /branches/xyz How can i do that? I tried to use merge from /trunk to branches/xyz but now sure whats going wrong some changes are alwasy missing in branch/xyz. How to find which revision is missing in /brances/xyz ...
Hi, annoyingly I've just given up on setting up Subversion on my Centos web server, mainly due to the fact that the server has cPanel, which uses EasyApache, which in turn doesn't support DAV and makes it awkward to install and configure manually. So, I'm now looking at alternatives - Git seems to be the VCS of the moment, but I'm only a...
Assume the following scenario. I have two files A.cpp and B.cpp in trunk. At revision 50 I create an experimental branch called X. Therefore at revision 50 both trunk and branch X are the same. I continue to work on trunk and add C.cpp and D.cpp. I then realize that there is a bug in A.cpp and so I fix the bug. Now my question is ho...
I want to add svn properties (like svn:keyword=Id Date Rev Author;) to files on commits on new files. For this to work there may be two main options: client-side, altering the autoprops in the svn client configuration Server-sode, do some magic with commit-hooks The client side is not always desirable, as control over the client se...
hi, I'm new to eclipse plug-ins. I'm trying to write a plug-in that calls "replace with" -> "Latest from Repository" for a specific project every time i start my eclipse. couldn't find the class which i have to call to execute that command. any help is appreciated. ...
What is the simplest way to undo a particular commit that is: not in the head or HEAD Has been pushed to the remote. Because it is not the latest commit, git reset HEAD doesn't work. And because it has been pushed to a remote, git rebase -i and git rebase --onto will cause some problem in the remotes. More so, I don't wan...
Hello, I'm new to using Subversion and have just set up the following - SVN on a remote server and SVN on a local PC. I have created a repo on the remote server at /repos, then i (svn) imported a live website's files into that repo. I then checked out (using svn+ssh) a working copy to my local PC, directly into a local LAMP setup under /...
Hi! I get the infamous "MERGE of 'whatever': 200 OK" whenever I try to commit using a post-commit hook on Windows (running the repository and Trac locally), and I'm going crazy. I've been looking all over for a day now, without finding any solutions. So here's how it's set up and what I've tried so far: Settings: Windows 7 (64-bit) Vi...
Ok.. I have looked through this site and just can't seem to find the answer I am looking for. We have a multi server setup for our web sites, typically (DEV/QA/PRODUCTION). Our sites are .net which require some sort of build before being deployed. We are using SVN for source control and are looking for a tool/website/something that will...
Hi folks: Suppose I got a file amended in two revisions, says 100, 110, in a branch. If I solely merge 110 to trunk, would the modification in 100 be brought over to trunk also? ...
Directly from vim, is there a way to check files into cvs or subversion? I know I can just use a different console window to check in any changes, but it is so much more convenient to be able to do everything from the same window, if possible. ...
I have installed Trac on my webserver. First of all it seems in secure because it immediately exposed my repository to the world. How does Trac access my repository without providing it with some credentials to access the authz protected repository? Second, can I use the same users or groups in svn's authz to use as the users and groups ...
I just discovered that the automated dumps I've been creating of my SVN repository have been getting cut off early and basically only half the dump is there. It's not an emergency, but I hate being in this situation. It defeats the purpose of making automated backups in the first place. The command I'm using is below. If I execute it ma...
Hi, after trying to merge changes to an svn trunk back to the branch with the following command: ../branches/myBranch$ svn merge -r 94:171 https://.../trunk --dry-run I get the following error from SVN: svn: REPORT of '/svnroot/simspark/!svn/vcc/default': Could not read chunk size: Secure connection truncated (https://simspark...