version-control

Maintaining file permissions across SVN updates?

I have a series of python scripts with execute permissions in Linux. They are stored in SVN. If I then run svn up to update them, the overwritten files are back to 644 - ie no execute permissions for anyone. Yes I could just script it to chmod +x * afterwards, but surely there's a way to store permissions in SVN or to maintain them wh...

Per-project source code provides in Visual Studio?

Can I use multiple source control providers at the same time in Visual Studio? Global switch is not enough for my needs (I have one project in SVN, another one in TFS etc.) ...

What would be a good "CMS" for me to use?

Hey, I'm looking for some sort of CMS system to implement here in terms of "documentation" system. Now, I'm not to sure about which system(s) would suit my needs best, so I thought I'd come here and type up my requirements so you could help me in narrowing down all the different options. One important note to make is that I'm not looking...

Git: Is there a way to figure out where a commit was cherry-pick'ed from?

If I cherry-pick from multiple branches, is there a simple way to figure out where the commit was coming from (e.g. the sha of the original commit)? Example: - at master branch - cherry pick commit A from a dev branch - A becomes D at the master branch Before: * B (master) Feature Y | * C (dev) Feature Z | * A Feature X |/ * 3 * 2 *...

Should I check-in IDE project files to version control system?

For a Java project (with the team of 5-10 developers) should I store my IDE project files (e.g. Eclipse or IntelliJ Idea) in version control system (currently I store only build scripts)? What's the best practice? PS Do you aware of any tools to automatically generate project files for common Java IDEs according to some descriptor? ...

Team Coherence with Visual Studio 2010

For source control we currently use Team Coherence 7.1.3.25, which has been working great under a few different editions of Visual Studio, the latest being VS2008. We are migrating to VS2010 and I am not sure how to get TC to work with it. Do we need to make the switch to TFS, or is there an option to get TC to work with VS 2010? ...

Version control of software refactoring

What is the best way of doing version control of large scale refactoring? My typical style of programming (actually of writing documents as well) is getting something out as quickly as possible and then refactoring it. Typically, refactoring takes place at the same time as adding other functionality. In addition to standard refactoring ...

How do I integrate Mercurial into Coda?

I tried using the plugin from app Changes, but it doesn't work, it says "No SCM found". Does anyone have a way to integrate Mercurial into Coda or know how to solve this problem? ...

Is there a way (perhaps with some coding) to upload a local CVS history into Google Code SVN?

I have some old personal/proprietary code that I want to "promote" to open-source. But I'd really like to preserve (and publish) the full CVS history... is this possible through Google Code's SVN repository? ...

Is it possible to version a asp.net site like you can do with dlls?

Is it possible to version a asp.net site like doing so with AssemblyInfo.cs in Class Libraries? ...

Using SVN alone or in small workgroups - workflow approach?

Hi everybody, I have spent some months working on a web application and we're come close to production stage. It's soon time to expand the development group with 1-3 people on this project. I have not too much experience on working with SVN, but It's obviously the choice for a big part of the larger companies out there, so I am guessin...

Version Control: multiple version hell, file synchronization

Hello. I would like to know how you normally deal with this situation: I have a set of utility functions. Say..5..10 files. And technically they are static library, cross-platform - SConscript/SConstruct plus Visual Studio project (not solution). Those utility functions are used in multiple small projects (15+, number increases over t...

How can I send out diff's of submitted changes to the entire project whenever someone commits a change?

I'd like to be able to send all the contributors working on a project a message whenever a commit is made. This way, everyone sees the contribution, and hopefully someone will take a look and spot bugs and whatnot. Furthermore, it provides our bosses with a nice and simple, if a little incomprehensible, way to get an idea of how the proj...

What are the advantages of a distributed version control for a team that is effectively never distributed?

When working remotely, our team only has access to our source code by remote desktop into our office PCs so we never really work in offline mode. Does a distributed version control system like Mercurial or Git still give us advantages over our current centralized Subversion set up? If so, what are they? Are there any drawbacks or pitfall...

Paralell development Branches w/ Bazaar

I have two branches (or tags?) where I need to keep the same file structure with different versioned contents. One version contains everything, like development scripts, configuration files, etc. while the other contains only things that get redistributed. How can I accomplish this using Bazaar? ...

Jump to 'git add -i' patch command (5) directly

How can I get "git add -i" to start up in patch mode directly without having to type "5" + Enter? I know about "git add -p", but it's not the same as it doesn't show me a list of files to select from first. This is very annoying because I'd like to jump between "git add -i" and "git commit" very quickly to turn my dirty tree into some ...

Database Schema Versioning Strategies

I work on a project that uses a reasonably large database, the live version weighing in at somewhere around 60-80GB. The live database is the only real definitive source of our schema, and because of its size duplicating this database is too slow to be done often. This means we have ended up developing our database schema in a pretty ad ...

Can GitHub show the history of changes made to one file?

I want to do: git log -p [path/to/file] in GitHub because I want it to look pretty, and I want a link to send to someone else w/o the code. Thanks! Matt ...

Is it bad practice to allow dots in SVN tags/branches' names?

In my SVN repository tags are listed by version where name contains dots. e.g. 0.10 or 0.12.1 branches are named like proj-0.24-rc In the same time, for example in Mono project branches has not dots. Is it some practice to avoid dots? Could it be treated like extension delimiter (by web server where repository is been served), etc? ...

How to find commits by a specific user in Git?

Our project uses Git as the version control system and recently I needed to review someone's commits. How can I see a list of commits made by a specific user? ...