We are using Git and our workflow consists of a 'dev' and 'master' branch which lives on GitHub and each developer's local repository. No work is performed directly on 'master' or 'dev', but rather in local branches and only merges happen on 'dev' and later with 'master'. We do not push local branches to GitHub. For some reason develope...
I'm using git for a personal project at the moment and have run into a problem of having one codebase for two different environments and was wondering what the cleanest way to use git would be. Main Desktop I Use this machine for most of my development. I have a git repository here that I cloned off of an empty repository that I use on...
I had to restructure the projects in SVN as it was not added as per the recommended repository structure (no tags, branches and trunk folders). However after moving projects to the new structure we have lost the history of all the files. How can I get back the history of all the files? I created the copy of the Dev => Project1 to Proje...
Hi All, In my company, presently we are using Rational clearcase as the Software Configuration Management tool for our Embedded software development. The software is basically for Automobiles, to be specific for Engines (I dont think these information really matters). But I find Clearcase to be very slow is performing any the activities...
Our application's DB (SQL Server 2005) has tables for application's metadata. Changes to these metadata tables (I mean insert/update/delete) can be done via GUI interface (not using SSMS). Most of the time developers change their own copy of database. The question is - how to "merge" these changes to metadata records into one? The probl...
Every so often when I run git add . to add new files to my repo my git index will reset and think all the files in the repo have been deleted. I run these commands: git status git add . git status git commit -a -m "Commit message" everything looks fine at all those points until I commit and it says every file was deleted, all I have t...
I want to be able to manage checkins/checkouts from Dreamweaver. Is this possible? Dreamweaver CS5 and TFS 2010. ...
I'm getting ready to deploy the first release of our software, version 1.0. Once it's out to our customer, inevitably, some bugs will be found. When I fix those bugs though, I'm not sure what "best practice" is for versioning it. When I release the fixes, would that be an entirely new version (in maven), such as 1.01 (or whatever the inc...
Does anyone know of any tools for extending the functionality of Sharepoint's existing version control system for Office documents? It'd be great to be able to do branching/merging, or to store versions as "deltas" off the previous to cut down on storage used. Any suggestions at all would be helpful. Thanks in advance! ...
Oftentimes, when using git, I find myself in this situation: I have changes to several files, but I only want to commit parts of them. I have added several untracked files, which I want to track and commit. Solving the first part is easy; I run: git add -p Then, I choose which hunks to stage, and which hunks remain in my working t...
Does anyone have a valid alternative for using commented out code checked into the repository for findability reasons? The reason I ask is because I had a discussion with a fellow developer recently on checking in code that is commented out. My stance is that commented out code should never be checked into our VCS since it is not techn...
Is there any (mysql) db diff tool that can output the differences between 2 dump files (or 2 db) as a series of ddl and dml sql statements? I would like to maintain the db version controlled and so far the 'best' option i've seen is create a initial dump of the database and then put the modifications as a serie of scripts. The problem ...
I'd like to be able to manage my app dependencies in Mercurial such that inside my app I have a fork/clone of the dependency repository. I'd like to make and commit changes to the dependency repository inside the app, but still pull and merge changes from the dependency's primary repository. Pushing my app should push the dependency repo...
Is there any way to properly integrate Subversion control into VS2008? I'm currently using the TortoiseSVN shell extensions, but I keep forgetting to check in new files and it's easy to get in a confused mess. On another project I use VS2008 with SourceSafe, and it's really nice having most things automated or controlled simply by using...
obviously bzr clone, bzr branch and bzr checkout all do the same thing when given an URL as parameter and executed in a non-bzr directory. is there any difference for later bazaar workflow? i.e. bzr commit, bzr update and friends. ...
We are currently using CS-RCS Pro for source code management, and are looking for to replace this due to performance issues. It is based on client side file access with no own protocol, which makes it painfully slow to use over a slow VPN line since it always rewrites the whole history of a file. It does however have a GUI client which i...
Hi Guys, I'm currently signed up with a third party service that hosts my mercurial repositories as a central hub to push my changes to as a sort of backup. Now, I'm looking at a system to backup my laptop and am concidering Mozy. I'm a loan developer, and work on a laptop and am usualy connected to my internet via wifi with my laptop ...
I have installed the latest hg package available for Fedora Linux. However, hg clone reports an error. hg clone http://localmachine001:8000/ repository reports: "abort: error: Name or service not known" localmachine001 is a computer within the local network. I can ping it from my Linux box without any problems. I can also use the...
I'm newish to the python ecosystem, and have a question about module editing. I use a bunch of third-party modules, distributed on PyPi. Coming from a C and Java background, I love the ease of easy_install <whatever>. This is a new, wonderful world, but the model breaks down when I want to edit the newly installed module for two reas...
My subversion VM died the other day (host hardware melted) and I had to restore a backed up copy of the vmware server image. The restore went well and the VM is running again on a new host. The problem I have is that my restored repository is at revision 60 but my working copy on my PC is at 66. When I try and commit my working copy I g...