My team recently decided not to use the "trunk" branch that is typical of most subversion repository layouts. We found that at any given moment there was always a particular branch that functioned in the traditional role that trunk would hold in other repositories. That is, we always have a highest-numbered branch that represents the nex...
Eclipse project, I have Subversion set to ignore the bin directory, and also within Eclipse I added bin to the list of ignored resources. However, every now and then Eclipse puts a .svn directory into bin anyway. This doesn't interfere with Subversion checkins (as the Subversion commandline client obeys the standing directive to ignore ...
Are there any good tools for merging/resolving conflicts for Bazaar + Eclipse? I wish Bazaar was integrated with Eclipse the same way Subversion is. ...
I just started working on my first Visual Studio project, and I imported all the existing code for the project into an SVN repo of mine without checking which files were binary and which weren't. So now I'm trying to clean up the repo and I've come across some .sbr, .pch, and .res files. I figure the .pch file doesn't need to be in s...
Working on three different computers at two different locations, on projects that are in subversion, I once in a while forget to check in stuff at one location, so that I cannot work on the latest code, when I want to continue working on the project at another location. I am sure other have had similar problems. What are some things I ...
I ignored a file in TortoiseSVN by mistake. How do I reverse this and add the file to my repository? ...
I have a folder, called "files". It's already in the repository. Now, new files are constantly added to this folder and it's subfolder. What command can I type to add all the files that have not yet been added. This does NOT work: svn add files It says svn: warning: 'files' is already under version control ...
Hi All, I have installed the latest VisualSVN (2.0.5) and its trac-package on WindowsXP, but ran into a problem. The trac system works, except the "Timeline" tab. When I clicked on it, I saw Oops… Trac detected an internal error: OperationalError: attempt to write a readonly database Does anybody have any idea, why it does not works...
Hello, we have svn setup through Assembla with CI Team City. I understand source control, my team is new to it? How should we proceed with work? Right now our environment, is not organized as it should be. I am also trying to get Trac working for our group. What should we do each person work on there own branch? Merge the changes back to...
I have a script to check if any data is available on svn repo path but not added into svn. It works fine for me but this gives stderr for adding and sending files like below; Adding 1/a Sending 1/a Transmitting file data ........... Committed revision 529. Code: use strict; use warnings; sub notAdded { my @svn...
Anyone had any success getting SVN to merge Visual Studio project (.csproj) or solution (.sln) files that have been edited by two users? Example User A checks out project User B checks out same project User A adds a file User A commits changes User B adds a file User B commits changes Seems to me that at step (6), svn, Tortoise, Ankh...
I have a subversion repo with the following layout: svnrepo/projectA/trunk svnrepo/projectA/tags svnrepo/projectA/branches svnrepo/projectB/trunk svnrepo/projectB/tags svnrepo/projectB/branches which I would like to move to a mercurial repo with a revised layout: hgrepo/projectA hgrepo/projectB What is the best way of doing this? S...
I'd like to set the ClickOnce publish revision to the Subversion revision of the code's repository — e.g. 3.1.9.2453 for version 3.1.9, based on SVN r2453. Now, for the assembly version, I know I can use TortoiseSVN's SubWCRev.exe to generate AssemblyInfo classes that contain the build revision. However, it's not quite as simple with Cl...
When using source control, the way I am used to working is to develop on the trunk and then branch the trunk just prior to moving into QA. I was talking with some other people in the department and apparently there are some passionate views about a different way of working, which would be to create the new branch at the very beginning o...
I have a PowerShell script I use for creating distributions that copies compiled files from a few places and zips them up with winrar. In the script, I change to a directory containing the folders I want to run and execute this: Invoke-Expression ($WinRAR + " a " + $zipPath + " " + $WinRARFilter + " " + $DistName + "-zip " + $WinRAROpts...
Hi, on my osx leopard i've just installed svn, version 1.6.2 (r37639). But some of my developer tool such as Zend Studio, etc are not compatible with the repository create by this subversion version. Are there some svnadmin options that I can use to make it works? ...
I have just done something without thinking it through. I have made a branch from working directory containing local modifications using TortoisSVN. I am assuming it did a copy and switch in one shot. Now the first version of my new branch is different from any version of the trunk. The question is, how do I reintegrate this branch b...
I'm currently maintaining a project I've inherited from some one else and the SVN repo is a bit of a mess. I've gone through and cleaned most of it up but there's a folder in the repo where admins can upload files to via a web form within the application. Currently this folder is in SVN and contains several images in SVN. Being the SVN r...
Is there any way with subversion or any other VCS that i can keep the checked out files in the .svn directory in a different place then the directory where they "belong". For example having some toplevel /work/my-source-tree and a /work/my-source-tree-svn directory? I know why the files are duplicated in .svn directories (fast detection...
I am getting a SVN server setup and will be using the feature branch method. I plan on having 1+ branches making up a release tag. How do I merge (?) multiple branches into the release tag, while still maintaining diffs and such? I've given an example of our workflow below. Multiple devs pull to local Create feature branch Commit to bra...