version-control

How to do branch and merge operation in VSS?

Anybody describe me with the example and step by step operation about how to branch a code and then after branching how to merge back the changes in main code. Thanks & Regards, Hussain ...

What are the differences between ClearCase and Visual SourceSafe

Whats are the differences between ClearCase and Visual SourceSafe products? ...

TortoiseSVN: How do I export an entire file tree from a specific date

I have my project in Tortoise SVN repository. I want to export the project to the disk, to the same state it was on a specific date. I do not have a branch/tag for that date. Is there a way to achieve that? ...

Database creation script - external parameters/settings

Question Summary: Is there a better method than the one posted below to implement the database-creation stage of an automated deployment? Background/Requirements: I am in the process of attempting to develop a coherent database version control process using an approach similar to this one. This question is specifically about the bas...

How to mark an issue as resolved from the commit log?

I noted that in BiBucket.org when your commit log contains a number like #12 this number is linked to the bug number 12. I found this feature interesting, and I wonder if there is any keyword that would allow me to mark the issue as resolved from the commit log instead of going to the web interface each time. If bitbucket.org doesn't d...

How to reset a remote GIT repository to remove all revisions?

How to reset a remote and local GIT repository to remove all revisions, and start fresh with the current Head as initial commit. ...

Gettext .po files under version control

Currently using Gettext on a project and the .po files are nicely kept under version control. PO files of course contain translations, but in addition to that they also contain some metadata - information about the exact files and line numbers where the translatable strings are located. The problem is that each time you update the PO f...

TFS: Is this possible?

We have 3 environments: dev, test, and staging. I want to check in and out of TFS. When we make changes, I want to promote the code to the dev web server. Next I want to promote the changes to test, then to staging. Would it be possible to do this with Team Foundation Server? ...

Howto prevent git from pushing changes to some files

Hi. I've cloned a subversion repository using git svn. The source has some config files that i have to edit to fit my system. I would like to store my changes to those files in my local repo (to easily switch between branches without worrying about locally modified files) but i would like to prevent those changes to be pushed to the rem...

Convert p4 move to p4 integrate

Is there a simple way to convert a (large) list of p4 moves to p4 integrates? There are a lot of pending modifications to the moved files, so just reverting and instead integrating isn't an option. Perforce won't let you just revert the deleted file (which would leave the desired integration behind). ...

Web based version control for documents

I'm looking for a Version Control system that has a pretty front end that I can customize to look the way I want. Users need to have the ability to upload documents and edit them - Based on their access level. Some documents will require a higher access level to edit. Some documents will be available for download to all users and some w...

How to have Git 1.6 follow "beyond symlinks"

Apparently, the bug where git follows and track files beyond symlinks (git add symlink/) has been fixed around v1.6. Now this was a bug that works in my favor. Now that we've upgraded to v1.6.3.3, is there any way to reproduce that behavior without downgrading? ...

Hooks for git-svn

Can I set hooks for "pull"/"push"ing from/to a git-svn managed repository? The situation is that I have a project host on Google Code, and use git to manage the local working copy. I want to set some hooks so that when checking in/out data from/to the SVN repository with git svn fetch and git svn dcommit, I can do some modification to t...

Version control development test records in database

I have some table and records in a database, that I use to manually test my (PHP) code. Suppose, I'd like to share these records and table structure (e.g: with other developers); if some model changes or new table added, everyone will aware. How do you integrate to your development process this need? My idea is on every commit dump the ...

Git Submodules: Is it possible to have more than one URL for each?

I was wondering if it is possible to have more than one URL for each git submodule. It would be interested to have more than one source of it if one of them is down or someone is behind a proxy that blocks one of them. Have you ever had this problem? How would you solve it? ...

Can't Push After git reset --soft HEAD^

Hey guys, just now I committed and pushed something (yes, my mistake on the push) that I decided I should 'revert' or 'undo'. So I was told to issue git reset --soft HEAD^ on my end, and I figured this would somehow create a 'revert' commit that once committed would make it as if the change never happened. I don't mind if the history of ...

Will adding an open source license to my project apply to the entire project revision history?

Assume I own some open source project with no license information. Furthermore, assume nobody has contributed publicly yet and so I own the project's source code and copyright. Say the source code is already hosted online. If I decide to give it an open source license by uploading the associated COPYING document to the repository and a...

New commits aren't on the head

Long story short*, I did some things with my git repository that I don't know how to do, and ended up detaching my head, that is, when I commit master isn't up to date. How can I fix this? Do I have to merge? (If so, what are the exact commands I want to run?) When I run git branch, it tells me I'm currently on no branch $ git branch...

Is there any formal way or known way to canonicalize an xml file to generate diffs?

There seems to be many questions WRT tool to generate diffs between xmls, but there wasn't this question yet, so anyone who knows this show me a link or paste any example anyone already solved this problem. Canonicalizing an xml file means, reordering the appearance of attributes reordering the appearance of tags (selectable by comman...

Tracking Excel files in Version Control

We are branching out beyond the development team and trying to get other groups within my company to use version control for important documents that need change tracking. One frequent need is for Excel spreadsheets. These are large spreadsheets, modified fairly frequently (weekly or monthly) but with only a small portion of the cells ch...