I have recently run into a particularly sticky issue regarding committing the result of a merge in subversion. Our Subversion server is @ 1.5.0 and my TortoiseSVN client is now @ 1.6.1. I am trying to merge a feature branch back into my trunk. The merge appears to work okay; however, the commit fails with the following error message. ...
Suppose you have the following subversion httpd server: http://svn.mycompany.com/svn/<project-name> Suppose you have complex authorization rules that specify who can read where and you have written them down in the svn-access-file.conf which contain the path-based authentication configuration. Now suppose that you would test th...
We have some feature branches that can get put on ice for a few weeks at a time. After making many changes in the trunk, is it best to merge the changes from trunk into the branches or drop the branch and create a new branch directly from the trunk and copy the changes from the starting branch into it. The reason I ask is that for a me...
I have a solution in Subversion that I now will create a customer specific version of. It's unlikely that this version ever fully will get merged back into the main development. There will however be development both in the main trunk that I easily need to get into the specific project and the other way around (development in the custom ...
I'm trying to exclude subversion's folders from being tracked by git. I tried a couple different setups for .git/info/exclude, but it doesn't seem to work. I would use git-svn, but it's a pain to request access to get that to work, so I'd rather just work around this by excluding the folders. I want to exclude ".svn/entries" I've tried...
I'm using a large (thousands of source files) public project with minor (a dozen source files) local modifications and additions. The local modifications aren't relevant to other users of the big project. The project uses svn, as do we for our own projects. I want to be able to get the updates from the project when it is updated and i...
I am trying to reorganize a subversion 1.6 repository that has branches. It appears that if you move a file in the trunk and that file has changes in a branch, when those changes are merged into the branch, they are no longer there. I will try to illustrate below: 1. Repo before move trunk/a.txt trunk/b.txt branches/feature...
I'm trying to share multi-module Maven project (using m2eclipse plug-in) from SpringSource Tool Suite 2.0.0 to Subversion server (Subversive plug-in for Eclipse). I've found that svn:ignore property is not propagated to submodules of the parent project: I need to right-click on the property and run "Apply recursively...". More, it won't ...
I have a solution that is source controlled with Subversion and AnkhSVN in Visual Studio 2008, but I would like to remove source control from it, how do I do that? ...
I use SharpSvn library from CollabNET. I would like to set revision author while commiting, but I always end up with a commit with my Windows user name. This does not work for me: System.Net.NetworkCredential oCred = new System.Net.NetworkCredential("user", "pass"); client.Authentication.DefaultCredentials = oCred; I've tried a...
We are planning on a daily synchronization between TFS and SVN. The updates (Latest Version) from the TFS will be done to a network folder, and SVN repository will be updated to get the latest from the network folder. Is there a script to access the network folder from the SVN to get the latest? We were using TFS when the license expi...
What is the best-practice for maintaining a source code repository that automatically (or, at least, by default) rejects the inclusion of /bin, /obj, *.suo, etc. files? Should each developer be required to set a "global ignore" pattern list for their SVN client installation? [This seems too broad of an exclusion.] Or, should the sourc...
We just installed svn at my office. TortoiseSVN works (with putty to do the ssh thing--sorry if this doesn't totally make sense, I'm a total svn newbie, I always used cvs). I found psvn for emacs, which seems to be pretty standard. When I tried running it, it said it couldn't find svn. So I downloaded the client from tigris.org--which ac...
What is the best way to share source across local machines? I'm working on a cross platform project with an svn repository. I perform a checkout on one platform (perhaps osx), and make changes. I must then test my modified code on other platforms (xp, vista, ...) BEFORE checking it in. Manually copying files between machines or runni...
I work with software that is kept in svn for version control. I would like to use git (git-svn) however the software requires lots of setup and configuration before it can be used. There are tools that take care of all of the setup, including checking out all the code via svn. All the documentation for git-svn (I've been able to find) r...
A similar question has been asked recently, but is not the same. The Mercurial website has a detailed page listing comparisons for 4 different options for getting Mercurial and Subversion to interoperate. I am wondering if anyone out there has tried one or more of these, and could relate any really good or really bad experiences. The n...
Basically I want to run a script checking for the existence of a certain filetype at each new revision. Subversion is used for source control. ...
I'm using Eclipse with Subclipse to do some perl development. The Subversion repository is setup like: /repos /repos/dev/ /repos/dev/crontabs /repos/dev/crontabs/script1 /repos/dev/crontabs/script2 /repos/dev/daemons /repos/dev/daemons/script3 /repos/dev/daemons/script4 /repos/dev/tools /repos/dev/tools/script5 /repos/dev/tools/script6...
We need to perform some tasks when switching from one Subversion branch to another using TortoiseSVN. Is there any way to, say, call a batch file before and after the switch? The only thing I can find are pre-/post-update and commit hooks, but none of those get executed when switching between branches. EDIT: I am looking for client-si...
What is the SVN command to find the difference between two files on the hard disk (neither of which are in the repository)? What is the command to find if one of the file is in a particular revision of SVN? What are some of the cool things you do using SVN commands? ...