svn

What is the more efficient version control methodology: checkout or merge?

I've always used Subversion or CVS for version control, which use a 'merge' methodology. One of my friends raves about Perforce and how great it is with its change lists and check-out methodology. While I'm sure a lot of it comes down to experience & personal preference, I was wondering if any research had been done into which method o...

Any disadvantages in accessing Subversion repositories through file:// for a solo developer?

If you have Subversion installed on your development machine and you don't work in a team, is there any reason why you should use the svn protocol instead of file? ...

Deployment tool for LAMP

Are there any good deployment tools that can be used with LAMP and Subversion? Ideally it would handle both code updates and database migrations. ...

what is the best way to backup subversion repositories?

I'm new to svn and I'd like to know what are common methods of backing up repositories in a windows environment? ...

Subversion: Fail update when there are conflicts?

Is there a way to tell subversion "update/merge unless it would cause a conflict"? I know you can use --dry-run / status -u to check before running the update, but I often have others running updates and getting broken webpages because they don't notice the "C index.php" line. I've also noticed that svn doesn't seem too unhappy about...

How do I delete 1 file from a revision in SVN?

One of my co-workers checked in a some files in SVN and one of the files has a password in it. The password has been removed from the file and a new version checked in but the password is obviously still in the repository if we look at the revision history and go to that revision. (We're using TortoiseSVN as the client.) So how do I sec...

How can I find the revision history of the file that was deleted and then resubmitted to SVN?

This is a follow on question to "How do I delete 1 file from a revision in SVN?" but because it probably has a very different answer and I believe that others would benefit from knowing the answer. (I don't know the answer yet.) The previous question was answered and I discovered that that it is not possible to remove a revision from SV...

Can't create a subversion repository with Eclipse 3.4.0, svn 1.5.1

I'm working on mac OS x 10.4. I have a subversion repository stored on an external drive connected via USB. I created a new python project in Eclipse (using the PyDev plugin). When I use right click Team->Share Project to set up a new prject with subversion, I get the following error: Error while creating module: org.tigris.subversion.j...

Subversion ignoring "--password" and "--username" options

When I try to do any svn command and supply the "--username" and/or "--password" options, it prompts me for my password anyways, and always will attempt to use my current user instead of the one specified by "--username". Neither "--no-auth-cache" nor "--non-interactive" have any effect on this. This is a problem because I'm trying to ...

How do I begin using SVN?

I am ready to start using SVN, but I have NO (as in the money required for free beer) experience with source control. I have installed subversion on my server (that was easy, 'apt-get install subversion') but now I don't know what to do, how to configure it, or how to use it.What suggestions do you have, and where can I find good resour...

Rolling back bad changes with svn in Eclipse

Let's say I have committed some bad changes to Subversion repository. Then I commit good changes, that I want to keep. What would be easiest way to roll back those bad changes in Eclipse, and keep the good changes? Assuming that files relating to bad changes are not same as those relating to the good changes. How things change if good c...

Subversion or Adobe Version CUE 3 for Photoshop/Illustrator Files

This might seem like a stupid question I admit. But I'm in a small shop me plus two designers. Our backups are getting out of hand because they just copy/paste files if they need to make a change (version). I was all set to try Subversion to handle all of our files my text (code) files and their photoshop/illustrator and asset files. T...

Automated Builds

I currently use subversion for my version control via AhnkSVN and Visual Studio. I recently started using Tree Surgeon to set up my projects. It creates a build script automatically using NAnt. I would like to be able to automate builds regularly projects within SVN. I like the idea of doing a build on every check in but nightly buil...

Is there any way to sticky a file in subversion

We have been working with CVS for years, and frequently find it useful to sticky a single file here and there. Is there any way to do this in subversion, specifically from TortoiseSVN? ...

Can you modify text files when committing to subversion?

I want to ran the following script on text files that are being committed: # Send the commands H and w to ed # ed will append newline if the file does not end in one printf "%s\n" H w | ed -s $1 # Strip trailing whitespace sed -i 's/[ \t]*$//g' $1 # Convert tabs to 4 spaces sed -i -r "s/\t/ /g" $1 I see subversion has a start-com...

How to detect file ends in newline?

Over at Can you modify text files when committing to subversion? Grant suggested that I block commits instead. However I don't know how to check a file ends with a newline. How can you detect that the file ends with a newline? ...

Does git have anything like `svn propset svn:keywords` or pre-/post-commit hooks?

Browsing through the git documentation, I can't see anything analogous to SVN's commit hooks or the "propset" features that can, say, update a version number or copyright notice within a file whenever it is committed to the repository. Are git users expected to write external scripts for this sort of functionality (which doesn't seem ou...

What do you call the tags in Subversion and CVS that add automatic content?

Things like $log$ and $version$ which add data upon check-in to the file. I'm interested in seeing the other ones and what information they can provide, but I can't get much info unless I know what they are called. Thanks. ...

How are tags made in Subversion?

I know how to use tags in subversion. I create a tag every time I get to a release milestone. What I don't quite understand is how they work. Is a tag just a copy, made from what ever revision I specify? Or is a tag more like a reference, where internally subversion just says GO TO /trunk/project/ Revision 5 or whatever. The command ...

Keeping development databases in multiple environments in sync

I'm early in development on a web application built in VS2008. I have both a desktop PC (where most of the work gets done) and a laptop (for occasional portability) on which I use AnkhSVN to keep the project code synced. What's the best way to keep my development database (SQL Server Express) synced up as well? I have a VS database proj...