Hello, here where we work, we have a bunch of merging problems. We use SVN and I know that is not a problem with the tool, but with the policy. But, what are the best merging pratices/policies to minimize this. Or is there a VCS that makes merging more easier than SVN? ...
I'm working on a project that is being versioned with svn. Normally with git, I would pick which files I'd like to make as part of a commit with git add, and then make a commit. The problem is, I don't know if there is a similar way to do something like that in subversion. I end up working on a feature, then get interrupted to fix a bug...
I'm receving this error in Cruise Control: error xpto.cs(8,7): error CS0246: The type or namespace name 'xpto' could not be found (are you missing a using directive or an assembly reference?) After build my project. What I need to solve that? ...
I'm always having this problem and I didn't found the answer yet really. Let's say you setup your partner setups a new project and imports every single file of the it, including those ones related to enviroment configuration which should not be under source control during the development (ie. the database config file). So then I checko...
hey, I have one core site which has all the core functions. I then need to create 4 sub projects which will use the same core site but will have different front ends. From guides I think I could use branches but I couldn't work out if a bug is found in the core site would it be possible to commit changes to the core and then update th...
I am using Ankhsvn for a solo project. I would like to version this project and add a little log tag to specify release notes. Is this possible? I believe this is the tag feature, but it requests a folder to use which doesn't exist on my system (ie not the repository folder). ...
I have seen other posts on this site with answers, but I think I have a slightly different scenario. My situation is as follows: trunk and branch b1 at a certain point, b1 was 'copied' to trunk as trunk was redundant and branch had all relevant functionality dev continued on b1, and trunk but part of trunks dev involved moving some fil...
How do I sync all the code in the SVN repository (for development purposes) with the live code I have running in /home/site/public_html/, as in overwrite whatever is in live with the new code from the SVN repo (assume the SVN repo location is in /usr/bin/svn/project, just for the sake of the argument, even though it's probably far from t...
Is it possible to configure a selection of folders that will not be retrieved from SVN when running a build under CC.NET? I am releasing from my Trunk directory and there are folders within the Trunk folder that I do not want to retrieve as they contain large files that are not required for the build, we just keep them in SVN for tracki...
Before I do an svn up, I'd like to see in what that operation would result. Specifically, I would want to know in advance if one of my files would go into a conflicted state, but also, which files have changed. So, is there a possibility to do that? ...
We have a SVN repository structure with feature branches, where we finally do a svn merge --reintegrate into the trunk. This usually works fine (so far we had about 200 feature branches reintegrated). Now, when trying svn merge --reintegrate, we received the following error message: svn: Reintegrate can only be used if revisions 94538 t...
We have a PHP 5 web application and we're currently evaluating PHP CodeSniffer in order to decide whether forcing code standards improves code quality. We use subversion for our code repository and deployment base and I have added a SVN pre-commit hook to ensure all files committed are free from coding standard smells. The hook technica...
Hi, I'm trying to get the original revision of repository with SharpSvn? Is there any method in SharpSvn can help me? Thanks. ...
I am attempting to set a revprop using svnadmin setrevprop /path/to/repos propname propfile -r 0. Each time I set this property a trailing newline gets appended to the value. My propfile does not contain any newlines at all. (that I am aware of) This is svn 1.6.11, running the Collabnet Solaris binaries. If it matters I used vi in So...
We are in the process of installing svn as our version control and it works great. However, we previously used Contribute Deployer to push files to the production site. Everyone is kind of used to the web interface it uses and I am looking to see if anyone knows of any SVN Repo browsers (web based) that also offer update functionality?...
I have a bunch of SVN managed files with permission 664. The files aren't necessarily owned by me, but they're in my primary group. (I can only write to them because they're in my group.) when I "svn update" that folder it changes the owner of any changed files to me (fine, who cares) and removes group-write permission on the file, leavi...
Does anybody know how to setup a basic SVN server on my windows pc? I want to create an SVN repository to store the code for my home projects I've got lined up. Anyone know how to do this? ...
We would like to trace removal of a single line in a certain file amongst the many revisions to that file in SVN. I tried looking at various revisions / diffs to see when it was removed, but was unable to find the offending revision. How do we do this using a svn command? ...
I would not get to know svn:externals if I haven't run into the this page. So, I setup my working folder. Then mkdir lib/vendor svn add --parents lib/vendor svn ps svn:externals 'symfony http://svn.symfony-project.com/branches/1.4/' lib/vendor/ svn ci -m "add externals" svn update The "svn update" enlists the whole symfony folder and...
His, I have accidentally applied new formatting to a big xml file and commited it in svn. Because of the new formatting, if I select "Team -> Show Annotation" (Who Modified the Line) all information about previous changesets is lost. Is there a way to revert annotation history? Reverting my changeset, and commiting it again without ap...