What is best practice for using subversion (SVN) for managing a project that requires a single configuration file that has multiple concurrent versions for different environments. I.e. Project ABC is used for three different environments, that use the same code, except for a slightly modified configuration file. AND Project ABC is al...
Our product is game-like, and is very rich (~40M - 100M) in binary supporting files - textures, meshes, movies etc. Like kai1968, I'd like to be able to sync-in these assets, and not just code, with a single click. Strictly speaking, however, that is different than version control: I have no desire to burden our TFS with irrelevan...
We have recently added version control capabilities to our system, we are having hard time modeling these capabilities in a RESTful way. The system works as follows, when it's configured in "version-control" mode, before making modification to an entity one must check it out first (a private copy is created for that user). After modif...
I'm a big fan of the simplicity of TortoiseSVN. I also am interested in digging into git, and think it would make a good fit for an upcoming project. However, a strictly command-line based app can be a little intimidating. I've followed the TortoiseGit project for a little while, and it looks like they are past 1.0. Is there anyone usin...
Currently, I am working on a file that is shared between multiple projects in Visual Source Safe and we have come to a point where we need to update it to be specific to a certain project. Is there a way to safely remove the shared status from the file file? ...
So we're gradually moving all our projects across into SVN, from CVS. One project in particular has two parallel development streams that share a lot of code, and they accomplish this with a neat trick on branch tags. Some files are branched normally as they diverge on the different streams: foo.c 1.18 --- HEAD, VERSION-1...
I am using WinDbg with the source server so that it will display the source information in stack traces. But it shows the path where the source was built, not where it exists in my version control system. Is there a way to have it display the paths from my version control system? ...
I'm developing an application using SQLAlchemy and wxPython that I'm trying to keep distributed in separated modules consisting of Business logic, ORM and GUI. I'm not completely sure how to do this in a pythonic way. Given that mapping() has to be called in orther for the objects to be used, I thought of putting it on the __init__.py ...
BLUF: I am looking for SCM best practices for large / complex java based project. DETAILS: In my environment we have a single production DB cluster that is being accessed concurrently by a variety of different web applications. Our code is structured so that common functionality is extracted into separate projects and the resultant ja...
If I understand correctly version of subversion defines: A structure repository on server A structure of working copy on client side API between client and server Once we've install svn server, we don't touch/upgrade it. Things are more complex on client side. On client side (Windows) we currently use tortoisesvn. It's version (cor...
I need some sort of web-based source code repository slash issue-tracker. The point is to have greater visibility of our various internal projects. Any recommendations? Open source is a requirement. A ready-made virtual appliance would be nice. Internal github would be perfect, but AFAIK this costs money. Does anyone have experiences ...
Often when I work on a feature branch with git, I find a bug and start fixing it right away. I don't want to switch since the new feature is often what I need to reproduce the bug. After a while I have 2-3 files that contains the bug fix plus some other non-committed files containing the new feature I'm working on. Now I would like to m...
Most of our projects use a lot of common code. We are (finally) moving towards a system where we are managing that shared code in a uniform way. We treat the shared code as a separate project in SVN, then reference it as an external. However, we tend to point the external libraries to development branches or even the trunk while the proj...
Are there any Mercurial clients for Windows that have integrated SVN support? Our build server uses SVN and there are no plans to move towards Mercurial, but I prefer Mercurial over the other distributed source control clients I have tried (e.g., Git). I've looked into TortiseHG and the Mercurial homepage, neither of which seem to integ...
Is there a source control system (besides CVS) that can be configured to NOT store local copies of files? Or perhaps it just doesn't do it by design? Ideally, one could configure such option by extension or file size. For example, if I do sometimes want to store large movies or pictures in SVN, the end result is double the space usage o...
I'm trying out git for the first time and am trying to follow instructions supplied by github. However, I seem to be failing on the last step. The following steps are provided by github: Global setup: Download and install Git git config --global user.name "Your Name" git config --global user.email Next steps: mkdir SomeFo...
I have been tasked with coming up with a strategy for branching, merging and releasing over the next 6 months. The complication comes from the fact the we will be running multiple projects all with different code changes and different release dates but approximately the same development start dates. At present we are using VSS for code...
In order to simplify the build process, I've been trying to reorganize my version control repository. I am developing a simple client-server application. Following Rob Williams' advice, I have separated the client and the server into separate projects each with their own lifecycle. The problem though, is that client and server share som...
I'm using SQL-Server 2008 with Visual Studio Database Edition. With this setup, keeping your schema in sync is very easy. Basically, there's a 'compare schema' tool that allow me to sync the schema of two databases and/or a database schema with a source-controlled creation script folder. However, the situation is less clear when it com...
I have two development trees v3.3, and v3.4 in one SVN repository. They both contain a project called test-harness. However, the v3.4 developers have wrecked the test-harness so we need the test-harness from project in v3.3 to overwrite what we have in v3.4. I want to retain the history of change made to 3.4 test-harness as it has some i...