svn

How to quarantine a specific subversion revision?

I have a revision that has been committed to SVN trunk which I would like to roll back. However, I would like to retain the changes in some fashion such as a branch or even a patch file. Any suggestions? ...

Can I emulate svn:externals using mercurial?

We are considering a move from SVN to Mercurial, and have encountered a stumbling block. We currently use svn:externals to automatically pull a common set of libraries into the working directory. I can't find support for anything like this in Mercurial. Is there a way to do this automatically with Mercurial, or do I need to fake it as ...

Tools for SVN Merging

SVN merging is very time consuming (especially on large code bases) and error prone. Eclipse and Netbeans plugins don't serve me very well. At the moment I'm using a combination of manual "svn merge" and the graphical diff Meld. Are there better alternatives (non-win32)? ...

FogBugz, WebSVN & Cygwin - Diffs Not Being Generated

Hey Guys, I can appreciate what I'm about to ask is a bit specific and a small niche but if you could provide some help you might actually let me keep some of my hair! I originally posted the query over on the FogBugz technical support page, but haven't had much joy. Basically I am using webSVN as a repository browser to provider log ...

How do I Automate Keeping my TortoiseSVN Project Up-to-date?

I am using TortoiseSVN for my Subversion repository held on a USB drive. When I move from one PC to another, is there a way to automatically identify that files are out of date (without using the Check for Modifications menu). It would be nice just to be able to see that the folder on my hard drive did not match that of the repository, r...

Best practices for source control and bug fixes

If we need to issue a bug patch that does not include current development that has been committed, or any changes from their current version, what should be done to make the process safer and with lower overhead? We are currently using Subversion for our source control in a small (3 developers) team primarily developing in Visual Studi...

Is it possible to view the history of a line in SVN?

Using SVN and/or Tortoise SVN (or any other SVN tool, really), is it possible to view the history for a specific line of a file? Recently I've had several occurrences of coming across a line in a file and wanting to find the log entry associated with its creation (either to determine how old the line of code was, or to get a larger cont...

Strategy to migrate from StarTeam 5 to Subversion?

I need to migrate a large project from StarTeam 5 to Subversion, and I'd like to keep snapshots of (at least) 5-10 of the major releases. I've considered the following: Manual or scripted export/import of each snapshot. Advantages: straightforward, easy to select labeled/dated versions. Disadvantages: time-consuming, does not preser...

What to do when your build process craps on your Version Control(Ant question)

So ive got a nice Java project, builds with Ant to a /dist folder. The whole project is under version control, so I can deploy the latest version just by 'svn export' on the path to the dist folder. But my build keeps deleting the .svn folders inside my dist folder, and all its dependents, because it cleans out the folder when building...

Tortoise SVN hidden _svn folders

They are specially annoying when I need to upload to the server a web solution. Is there a way of configuring SVN to create the _svn folders outside my working directory? If not, what is the best way to deal with them when you need to copy only the code? Update: Using "svn export" command is problematic because there are files that are...

How do you organize your version control repository?

First, I know about this: http://stackoverflow.com/questions/51217/how-would-you-organize-a-subversion-repository-for-in-house-software-projects Next, the actual question: My team is restructuring our repository and I'm looking for hints on how to organize it. (SVN in this case). Here's what we came up with. We have one repository, multi...

Subversion, external references, binaries, and MSBuild/Visual Studio

I have a project that is stored in a Subversion repository. In this repository, in a different folder, I have a set of libraries that I use in many of my projects. These libraries are stored as binary files, ie. the dll's, pdb's, and xml's. Here's an example layout: <repo-url> \Libraries \SQLite \SystemHooks ...

I cannot commit changes after merge in SVN

Hello, I had a problem with committing changes after merging two branches of my project using TortoiseSVN. Here are details: I did a merge branch to trunk of project which I am working on. Project includes main repository and libraries joint to main repository as svn external (libraries are also branched) as subdirectory of project....

Svn Blame in Eclipse

Hi guys, I discover yesterday the SVN blame feature and I was wondering, Is this feature available from eclipse? Thanks, ...

Should I look at version control systems beyond Subversion?

Within the last year I have become addicted to subversion. I am an only developer and I also work on a few of my own projects. With SVN its really easy to manage everything - and because it is hosted on an online server though HTTPS I can access my code from anywhere. It is also great for deploying code to our production/development serv...

xcopy ASP.NET deployment of a Subversion-managed project

I'm currently using Subversion to manage my ASP.NET website. I'm finding that whenever I go to upload my website to my server, I'm copying a large number of hidden .svn folders and whatever contents may lie within them. Does anyone have any suggestions for avoiding this? I don't particularly want those hidden .svn folders on the product...

What's each SVN automatic conflict resolution action performs?

I wrote a batch script which recursively updates my source code against the company's working base. When conflicts occur, it prompts for an action. What is the difference between 'base' and 'theirs-full'? Does 'mine-full' means "keep my changes at the working copy, I'll commit them later"? ...

In Eclipse, how can I exclude some files (maybe based on the .svn extension or filename) from being copied to the output folder?

I'm developing a Java application using Eclipse. My project has two source directories that are both built and then some files are copied into the output folder. From the output directory I then run my application and all works well. However, I keep having these warnings: Anyone know how to get rid of these warnings? Maybe by excludi...

What TFS tool would you recommend?

I am mostly use to using Subversion for my source control. However, my current position has me using TFS. The UI of the TFS explorer and its integration with Visual Studio has me a little disoriented. I miss having tools like SmartSVN where I could see at a glance what I've modified and is pending checkin. What tool sets do you recommen...

Netbeans, generated code, and svn

We have a netbeans project that has an xsd that we use to create a wsdl and we use the wsdl to create a webservice. Since we are using types in our xsd jaxb is used and one of our webservice methods looks like this: public void someMethod( org.netbeans.xml.schema.line.Line x )... So that leaves us a problem with subversion since ...