version-control

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...

Bug tracker setup with Git integration?

I know I can do most of this by hacking Trac and using Git hooks, but I was wondering if someone has / knows of something ready. Commenting on (and closing) tickets from commit messages would be nice, specially if the diff appears inline with the comment/closing remark. sha1 hashes should be auto-linked to gitweb/cigt/custom git browse...

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...

Recommended Source Control Directory Structure?

I am going to be using Subversion for source control on a new J2EE web application. What directory structure will you recommend for organizing code, tests and documentation? ...

Are there any version control systems for 3d models / 3d data?

Well the subject is the question basically. Are there any version control systems out there for 3d models. An open source approach would be preferred of course. I am looking for functionality along the lines of subversion however more basic systems would be of interest as well. Basic operations like branching / merging / commit should b...

TFS - Branching for experimental development: Solution fails to load

Disclaimer: I'm stuck on TFS and I hate it. My source control structure looks like this: /dev /releases /branches /experimental-upgrade I branched from dev to experimental-upgrade and didn't touch it. I then did some more work in dev and merged to experimental-upgrade. Somehow TFS complained that I had changes in both source and...

Efficient synthesis of a 4-to-1 function in Verilog

I need to implement a 4-to-1 function in Veriog. The input is 4 bits, a number from 0-15. The output is a single bit, 0 or 1. Each input gives a different output and the mapping from inputs to outputs is known, but the inputs and outputs themselves are not. I want vcs to successfully optimizing the code and also have it be as short/n...

Is there a better way of writing a git pre-commit hook to check any php file in a commit for parse errors ?

What I have so far is #!/bin/sh php_syntax_check() { retval=0 for i in $(git-diff-index --name-only --cached HEAD -- | grep -e '\.php$'); do if [ -f $i ]; then output=$(php -l $i) retval=$? if [ $retval -gt 0 ]; then echo "===========================================================================...

Suggestions for a good commit message: format/guideline?

I'm at the beginning of a new project, and I'm trying to set up the repository in a smart fashion and establish some code style guidelines for everyone to be able to concentrate on code. Most of it is done, but I'm still unsure about the format I should enforce for commit messages. I'm all for freedom and just telling people to make the...

What software to use for a multistage development environment?

For me a multistage environment contains environments for development, testing, quality assurance, maybe a client review stage and finally production. It should allow easy collaboration between developers, project status tracking and easy deployment of the application to any stage for a specific version. You can propose specific tools ...

Why is branching and merging easier in Mercurial than in Subversion?

Handling multiple merges onto branches in Subversion or CVS is just one of those things that has to be experienced. It is inordinately easier to keep track of branches and merges in Mercurial (and probably any other distributed system) but I don't know why. Does anyone else know? My question stems from the fact that with Mercurial you c...

How to convince a company to switch their Source Control.

My current place of employment is currently in a transition, new ownership has taken over, things are finally getting standardized and proper guidelines are being enforced. But we are still using VSS, there really isn't any reason for using it other then that's what whats initially setup. We don't use Visual Studio, or any tool really...

version control practice

In my current job the supervisor's practice is to only check in production ready code. Most recently the project I was on involved work by 3 different developers with some file overlap. This meant manually integrating changes despite the fact that some changes took a day and then it was done. I wanted to see if this was a common pract...

How do you retrieve the commit message and file list for a particular revision?

I need to deploy a few files that were checked in sometime ago (can't remember the exact ones), so I'm looking to get a list so I can deploy just those files. What is the svn command to do this? ...

Source control system for single developer

What's the recommended source control system for a very small team (one developer)? Price does not matter. Customer would pay :-) I'm working on Vista32 with VS 2008 in C++ and later in C# and with WPF. Setting up an extra (physical) server for this seems overkill to me. Any opinions? ...

Branch / merge management in Subversion 1.5

I've used subversion for a while, and used the svnmerge.py script for a while in my old job to manage merges between branches. I believe Subversion 1.5 is now out, and was supposed to have some branch / merge management system integrated with it. So, can someone give me a quick overview of how to track merges in a branch with Subversio...

How do DVCSs (DRCSs) work?

I have been hearing a lot of good things about DVCS systems, in particular about bazaar. Apart from the concept of distributed repository, I see two main advantages being touted: the merge is better automated, and the rename is handled right. Could someone please point me at some text explaining how exactly the improvements work? How do...

Versioning library like SQLite database library?

I like how SQLite library can be included into an application and the application has a full-fledged database to use. Similarly, is there an open source versioning library that I can include into my application so that I can save versions of files as well as do diffs and merges? ...

Best SVN Tools

Just wanted to see what tools for SVN people use, perhaps i can find some new cool ones. Im pretty much standard right now, ankh and tortoise. See also http://stackoverflow.com/questions/372687/good-visual-studio-svn-tool ...

Storing third-party libraries in source control

Should libraries that the application relies on be stored in source control? One part of me says it should and another part say's no. It feels wrong to add a 20mb library that dwarfs the entire app just because you rely on a couple of functions from it (albeit rather heavily). Should you just store the jar/dll or maybe even the distribut...