Brought forward from http://stackoverflow.com/questions/1525027/subversion-feature-branch-requires-changes-from-another-feature-branch I have two feature branches: "FeatureA" and "FeatureB". FeatureA is complete, but not merged to trunk because it's not been confirmed whether it should go in the next release or not. FeatureB is in...
I type in this command frequently, and was trying to alias it, and couldn't for some reason. for FILE in `svn stat | awk '{print $2}'`; do svn revert $FILE; done This obviously does a large number of svn reverts. when I alias it: alias revert_all="for FILE in `svn stat | awk '{print $2}'`; do svn revert $FILE; done" svn stat runs ...
Let me start by saying that the problem I have looks totally weird to me! On a remote server, I have nginx as the web server and PHP running as a Fast-CGI module. I also host my SVN repository on the same server. Now I have a working copy of the repo on my local computer. I make changes to them, and commit to the repo on my remote serve...
Hello, I need to put versions of my software in my jsp pages. Can I do it trough XML files? Can Subversion record this in files that has been versioned? thankful Daniel Alves da Fonseca Maciel ...
Here is a command sequence showing distinct svn diff behaviours for adding versus copying files: $ ls -A foo .svn $ svn cp foo foo.svn-cp A foo.svn-cp $ svn diff foo.svn-cp <nothing> $ cp foo foo.cp-add $ svn add foo.cp-add A foo.cp-add $ svn diff foo.cp-add <contents> Some notes to head off irrelevant answers: I un...
I'd like to email the results of the build along with: svn revision(s) that are in the build commit message(s) for those revisions Other details like the location of where we ftp the resulting executables Can anyone point me to resources to show how to do this with CC.Net? I am able to get the standard email that is sent that contai...
Hello, people. I hope you can help me. In our development process we have a unix based file server with SFTP access (let’s call it A). This server store a large numer of xslt files we are working on. The thing is that these files aren’t under version control system. So you can imagine this nightmare. We can’t setup repository on this...
In a recent embedded project, we have used the following svn structure: project branches tags trunk electronics software branches tags trunk As you can see, there is a nested branches/tags/trunk directory for the software part. This was quite practical for software devs a...
I have a question as to the proper use of the trunk and branches for my SVN projects. For my team's project we create 3 major releases each year and sometimes a minor release or two in between. At any point in time we may have active development on 2 or even 3 releases. We have been doing all development in branches with a structure like...
As a subversion user, git's index is the most challenging new concept I'm facing as I consider using it for new projects. I read many people's comments saying that they don't use the Index (always commit -a) but I'm thinking there might be a killer reason out there as to why I would want to make use of it. (I'm sharing code with around...
There are similar questions here and here, however they are not the same, as they are asking about using mercurial and subversion together in a general sense. Reading through the Mercurial and Subversion page, there are four options, hgsubversion, mq, convert and hgsvn. hgsubversion and convert both require a full local copy of the repo...
In linux, how do I check if someone has not yet committed something? I remember I made changes on a server once..but forgot to commit. Now, I don't know which server I used to make those changes. ...
I wrote the following pre-commit script for SVN to validate that a user has submitted the minimum amount of information on a file commit. However, when trying to add/delete a directory, now it is failing. I know why it's failing obviously, I just didn't realize the pre-commit script was called on every action. How do I filter for the act...
Let's say I have working copies of several different folders from my SVN repository scattered across my file system. Their parent directories are not part of the repository. E.g. somedir1\ workingcopyOfA\ workingcopyOfB\ somedir2\ somedir3\ workingcopyOfC\ workingcopyOfD\ Now they all contain changes which I would l...
I know that I can save all my projects files into repository so deployment of new version of software become only using svn export into properly directory. But I have a feeling that it is not right way and for media files I should use some other utilities for deployment like rsync. But it is also a problem with double-side sync = I like...
We need to merge changes from branch to trunk. And we do not need any changes that we did in trunk since branch was created. 1. We do not need to merge sources - we need to replace sources in trunk with sources in branch. 2. We do not need files and directories that was created in trunk but does not exist in branch(or was deleted in bran...
I am using Visual Studio 2008, Tortoise 1.6.6, and VisualSVN 1.7.7. When I'm in Visual Studio if I rename a form it gives me this error: Can't set file 'C:\Dev\Production\Projects\Accounting\AP.Payables.svn\log' read-write: Access is denied. And then it says: Working copy 'C:\Dev\Production\Projects\Accounting\AP.Payables' locked I ca...
Is it possible to see full history for file if it was merged from branch to trunk? Or only history for trank will be accessible? ...
This is from svn docs(http://svnbook.red-bean.com/en/1.1/re44.html) $ svnlook changed -r 39 /usr/local/svn/repos A trunk/vendors/deli/ A trunk/vendors/deli/chips.txt A trunk/vendors/deli/sandwich.txt A trunk/vendors/deli/pickle.txt I can check for trailing slash ("/") and if that exists, then it is a folder. 1) But how can I...
I want to ignore only two files in my SVN, I am using Netbeans. These both are the config.php files located at different locations in same project. ...