svn

Migrating from Subversion to Git how can I find a commit given a revision number?

Migrating from Subversion to Git using svn2git (which internally uses git-svn) I'd like to know how I can find a specific revision commit. It is quite common to have issues tracker to have comments like: "Fixed in r12345". Given this, I'd like to be able, for example, to extract the diff corresponding to r12345. Thanks in advance. Re...

How to merge code on svn

I'm using subeclipse plugin for eclipse for SVN. My project looks like this : ProjectName\ - branches - special_ - tags - trunk I have currently checked out project from special_ and I've modified and added one class, how can I merge the code which I updated/added to trunk ? I'll take anything into consideration ...

Reporting on release changes when using JIRA, Ivy and SVN

Hey guys, Our team has a number of independant services, and (possibly nested) dependant versioned libraries - currently managed in Ivy. Whenever a dependant library is updated, all libraries and services dependant on this need to be re-released. Therefore the author of a change can carry other people's changes out to Production. We wa...

Develop multiple very similar projects at once

I am developing a semi-complicated site that is available in several countries at once. Much effort has been put in to make the code bases as similar as possible to one another and ultimately only the config file and some representational data will differ between them. Each project has its own SVN repository which maps directly to a liv...

Why do I get conflicts when Merging a branch to the Trunk and then merging it back to the branch?

Lets say I have a feature branch named "branches/BigFeature". I want to push those changes to the Trunk, make some changes to Trunk and merge back it all back into the "BigFeature" branch so development can continue. My steps were to: Merge the latest changes in Trunk to branches/BigFeature. (Tortoise SVN -> Merge a range of revisio...

How to use version control with VBA code?

I am developing a VBA application which is quite large. I want to use SVN for that application developing. How can I split my modules from the Excel document and how to upload my modules separately to source control? Please help me. ...

subversion: getting rid of versioned ".svn" directory

Hi there. I don't know exactly how it happened, but I have a versioned ".svn" directory in my repository. Don't ask me how it got there. If I tell svn to delete it, it does not want to, since .svn is a reserved argument. Force does not work. Any ideas? EDIT: Ok I solved it by svn rm ing the parent directory and adding it back in. Sti...

SVN Export Only Changed Files

I currently commit files to my SVN server (which is located on my web host), and from there I SSH in and export them to the working directory in my htdocs. As my application gets larger and larger, a full export is a waste of time. How can I only export the files that have been changed? svn export -r xxxx:HEAD http://svn/ Is a solut...

shell_exec with "svnadmin verify" returns nothing

Hi, I want to give output of svnadmin verify command from shell_exec() var_dump(shell_exec('/usr/bin/svnadmin verify /Users/osman/Desktop/SVN/name')); But it returns 'null'. How can i access the response of svnadmin verify ? Im working with PHP 5.3.2 on Mac OS X Snow Leopard ...

Do I want to mark my Visual Studio project as managed by Subversion?

I'm using AnkhSVN with Visual Studio 2008. When I add a new project to SVN, I am asked the following: Would you like to mark 'My Project' as managed by Subversion? The answer is so obviously yes - why would I add the project to SVN if I didn't want it to be managed by SVN - that I figure there must be some other meaning to the que...

Is there a bug in the svn rev macro of hudson custom email plugin?

When I try to add the svn revision value to my custom email all I get is always revision 400. The build number is correct and other information seems correct, but the svn info is totally wrong. Any ideas? Here is the help page for the email extension. ...

Is it safe to ignore ~sq_ queries when using LoadfromText

I'm working on some VBA to do exporting and importing (using SaveAsText and LoadFromText) of MS-Access objects in an application I'm supporting. I'm hoping to be able to start storing my code in SVN so that more than one developer can work on this application at once. I keep getting the following error when I bring in queries that start...

Environment Variable for defining differencing tool in Subversion

I see that there is the SVN_EDITOR environment variable to define what editor to use with subversion, and there's also SVN_MERGE environment variable for merging files. Is there an environment variable for defining the differencing tool? ...

Move your Working Copy

I tried to find out how to move my working copy. I know SVN move can be used to move files and folders inside your working copy but what about the working copy itself? I want to move it because I created a branch in a folder location that's different from my branch and had updated therefore all my .NET project references. So when I go...

SVN Production Deployment on Commit

Hi, I m setting up SVN on my local web development server and I'm wanting to create a post-commit hook that exports the repo to the production server (either via FTP, SSH, etc) when the commit message contains the word "deploy" or something similar. I know this has to be a common function for SVN but I can't seem to find anything that d...

Webuilder SVN Commit Shortcut

Hello! I've been using Webuilder to develop my project for a while and i don't want to waste my time finding the file i'm working on on the file explorer, right click, then click "commit to perform a subversion commit. How can i create a keyboard shortcut for Webuilder to commit active file easily? ...

XCode keeps lowercasing my file names!

I have OSX installed on a case preserving but not case sensitive partition: Which seems to be causing XCode and SVN to fight. At various points, for reasons I cannot discern, XCode will take a file that has mixed case, and save it in all lowercase to the file system. XCode will continue to display in its file lists the mixes case file....

How to configure Beyond Compare 3 for Eclipse conflict resolution?

What is the correct parameters to get Beyond Compare 3 working with Eclipse/Subclipse conflict resolution? In Preferences > Team > SVN > Diff/Merge there's the option to specify an external program to resolve conflicts. The default parameters are: "${yours}" "${theirs}" "${base}" "${merged}" And it suggests TortoiseMerge settings of...

Prevent command "del /s" from entering a folder

I need to recursively remove unnecessary files from a svn repository and i have the following batch file to do this: @echo on del /s ~*.* del /s *.~* del /s Thumbs.db However, this is also deleting the entries under the .svn/ subfolders. Is there any way to prevent this commands from being executed under the .svn/ folders so that it d...

Source Control Manager Backend

Hi Friends, What do you think is a better approach for Source Control Manager Backend. I am weighing File system vs Hosted Subversion service. Hosted Subversion--> (My company already has another group taking care of this) Advantages: * Zero maintenance on our end * Auto-backup and recovery * Reliability by auto-backup and file redundan...